diff --git a/mod/data/lib.php b/mod/data/lib.php
index 745f3730a4..23983b99c8 100644
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -1724,7 +1724,10 @@ function data_print_preference_form($data, $perpage, $search, $sort='', $order='
         $fieldname = preg_quote($fieldname, '/');
         $patterns[] = "/\[\[$fieldname\]\]/i";
         $searchfield = data_get_field_from_id($field->field->id, $data);
-        if (!empty($search_array[$field->field->id]->data)) {
+        if (!empty($search_array[$field->field->id]->data) ||
+            isset($search_array[$field->field->id]) && (
+                $search_array[$field->field->id]->data === 0 ||
+                $search_array[$field->field->id]->data === '0')) {
             $replacement[] = $searchfield->display_search_field($search_array[$field->field->id]->data);
         } else {
             $replacement[] = $searchfield->display_search_field();
diff --git a/mod/data/view.php b/mod/data/view.php
index b0c5077585..6d0005a9c0 100644
--- a/mod/data/view.php
+++ b/mod/data/view.php
@@ -171,7 +171,7 @@
                         $val = '';
                     }
                 }
-                if (!empty($val)) {
+                if (!empty($val) || $val === 0 || $val === '0') {
                     $search_array[$field->id] = new stdClass();
                     list($search_array[$field->id]->sql, $search_array[$field->id]->params) = $searchfield->generate_sql('c'.$field->id, $val);
                     $search_array[$field->id]->data = $val;