diff --git a/frontend/app/scripts/components/common/custom-field-labels.component.js b/frontend/app/scripts/components/common/custom-field-labels.component.js
index 3cc65868f5..68bc78a344 100644
--- a/frontend/app/scripts/components/common/custom-field-labels.component.js
+++ b/frontend/app/scripts/components/common/custom-field-labels.component.js
@@ -7,6 +7,7 @@
                 var self = this;
 
                 this.fieldsCache = {};
+                this.definedValues = 0;
                 this.fieldClicked = function(fieldName, newValue) {
                     this.onFieldClick({
                         name: fieldName,
@@ -18,6 +19,11 @@
                     CustomFieldsSrv.all().then(function(fields) {
                         self.fieldsCache = fields;
                     });
+
+                    self.definedValues = (_.filter(self.customFields, function(item) {
+                        return item.value !== null && item.value !== undefined;
+                    }) || []).length;
+
                 };
             },
             controllerAs: '$cmp',
diff --git a/frontend/app/views/components/common/custom-field-labels.component.html b/frontend/app/views/components/common/custom-field-labels.component.html
index b374c4e590..0845ab7043 100644
--- a/frontend/app/views/components/common/custom-field-labels.component.html
+++ b/frontend/app/views/components/common/custom-field-labels.component.html
@@ -1,7 +1,7 @@
 <div class="case-tags flexwrap">
     <span class="mr-xxxs text-muted"><i class="fa fa-code"></i></span>
 
-    <strong class="text-muted mr-xxxs" ng-if="!$cmp.customFields || $cmp.customFields.length === 0">None</strong>
+    <strong class="text-muted mr-xxxs" ng-if="!$cmp.customFields || $cmp.definedValues === 0 ">None</strong>
 
     <span class="double-val-label mb-xxxs mr-xxxs pointer"
         ng-repeat="cf in $cmp.customFields | orderBy:'order' track by $index"