diff --git a/src/app/core/components/feedback/feedback.component.ts b/src/app/core/components/feedback/feedback.component.ts
index 89abd60d641ee23057d8b366871ce92a87d627d6..49ad24e5064dc5fb6ad5a015484f358bf3b2e0ac 100644
--- a/src/app/core/components/feedback/feedback.component.ts
+++ b/src/app/core/components/feedback/feedback.component.ts
@@ -61,7 +61,10 @@ export class FeedbackComponent implements OnInit {
 
     this.feedbackForm.get('email').valueChanges.subscribe(
       (emailValue) => {
-        emailValue === '' || emailValue === null ? consent.setValue(false) : null;
+        if (emailValue === '' || emailValue === null ) {
+          consent.setValue(false);
+        }
+
         if (emailValue !== null && emailValue !== '') {
           consent.setValidators([Validators.requiredTrue]);
         } else {
@@ -115,7 +118,12 @@ export class FeedbackComponent implements OnInit {
   }
 
   get feedbackHasEmail() {
-    return this.feedbackForm.get('email').value && this.feedbackForm.get('email').value;
+    if (this.feedbackForm.get('email').value !== null && this.feedbackForm.get('email').value !== '') {
+      return true;
+    }
+    else {
+      return false;
+    }
   }
 
   get shouldAnimateClosing() {