diff --git a/client/src/views/email/fields/email-address-varchar.js b/client/src/views/email/fields/email-address-varchar.js
index 8d90842083..b4555d6f95 100644
--- a/client/src/views/email/fields/email-address-varchar.js
+++ b/client/src/views/email/fields/email-address-varchar.js
@@ -395,7 +395,7 @@ function (Dep, From, EmailAddress) {
                 };
             }
 
-            return false;
+            return null;
         },
 
         getValueForDisplay: function () {
diff --git a/client/src/views/email/fields/email-address.js b/client/src/views/email/fields/email-address.js
index 835ac829d2..e0a6bb1a2e 100644
--- a/client/src/views/email/fields/email-address.js
+++ b/client/src/views/email/fields/email-address.js
@@ -124,8 +124,7 @@ define('views/email/fields/email-address', ['views/fields/base'], function (Dep)
                 };
             }
 
-            return false;
+            return null;
         },
-
     });
 });
diff --git a/client/src/views/fields/array.js b/client/src/views/fields/array.js
index d5948aaf5d..5dfabb1e74 100644
--- a/client/src/views/fields/array.js
+++ b/client/src/views/fields/array.js
@@ -742,6 +742,8 @@ class ArrayFieldView extends BaseFieldView {
                 },
             };
         }
+
+        return null;
     }
 
     validateRequired() {
diff --git a/client/src/views/fields/bool.js b/client/src/views/fields/bool.js
index d9579513e6..dbd92ffd5b 100644
--- a/client/src/views/fields/bool.js
+++ b/client/src/views/fields/bool.js
@@ -81,7 +81,7 @@ class BoolFieldView extends BaseFieldView {
         let type = this.$element.val();
 
         if (!type) {
-            return;
+            return null;
         }
 
         if (type === 'any') {
diff --git a/client/src/views/fields/date.js b/client/src/views/fields/date.js
index 09807a73c1..f1e8462c43 100644
--- a/client/src/views/fields/date.js
+++ b/client/src/views/fields/date.js
@@ -339,13 +339,13 @@ class DateFieldView extends BaseFieldView {
 
         if (type === 'between') {
             if (!value) {
-                return false;
+                return null;
             }
 
             let valueTo = this.parseDate(this.$el.find('input.additional').val());
 
             if (!valueTo) {
-                return false;
+                return null;
             }
 
             data = {
@@ -366,7 +366,7 @@ class DateFieldView extends BaseFieldView {
         }
         else if (~['on', 'notOn', 'after', 'before'].indexOf(type)) {
             if (!value) {
-                return false;
+                return null;
             }
 
             data = {
diff --git a/client/src/views/fields/enum-column.js b/client/src/views/fields/enum-column.js
index 66dfde8431..e15abfd8b7 100644
--- a/client/src/views/fields/enum-column.js
+++ b/client/src/views/fields/enum-column.js
@@ -93,6 +93,8 @@ define('views/fields/enum-column', ['views/fields/enum'], function (Dep) {
                     }
                 };
             }
+
+            return null;
         },
     });
 });
diff --git a/client/src/views/fields/enum.js b/client/src/views/fields/enum.js
index d95985dfb9..54f2c92f5a 100644
--- a/client/src/views/fields/enum.js
+++ b/client/src/views/fields/enum.js
@@ -501,6 +501,8 @@ class EnumFieldView extends BaseFieldView {
                 },
             };
         }
+
+        return null;
     }
 
     getSearchType() {
diff --git a/client/src/views/fields/varchar.js b/client/src/views/fields/varchar.js
index cbf3835c90..330cfb418f 100644
--- a/client/src/views/fields/varchar.js
+++ b/client/src/views/fields/varchar.js
@@ -390,8 +390,7 @@ class VarcharFieldView extends BaseFieldView {
         let value = this.$element.val().toString().trim();
 
         if (!value) {
-            // @todo Change to `null` in v8.0 (and for all other fields).
-            return false;
+            return null;
         }
 
         return {