diff --git a/src/gui/app/directives/conditional-effect/conditionDisplay.js b/src/gui/app/directives/conditional-effect/conditionDisplay.js
index 18b0362c9..5e3fc4757 100644
--- a/src/gui/app/directives/conditional-effect/conditionDisplay.js
+++ b/src/gui/app/directives/conditional-effect/conditionDisplay.js
@@ -46,8 +46,8 @@
                 $ctrl.leftSideValueDisplay = "[Not Set]";
 
                 function getRightSideValueDisplay() {
-                    return $q(async resolve => {
-                        if ($ctrl.condition == null || $ctrl.condition.rightSideValue == null) {
+                    return $q(async (resolve) => {
+                        if ($ctrl.condition == null || $ctrl.condition.rightSideValue == null || $ctrl.condition.rightSideValue === "") {
                             resolve("[Not Set]");
                         } else {
                             const value = await $injector.invoke($ctrl.conditionType.getRightSideValueDisplay, {}, {
@@ -59,8 +59,8 @@
                 }
 
                 function getLeftSideValueDisplay() {
-                    return $q(async resolve => {
-                        if ($ctrl.condition == null || $ctrl.condition.leftSideValue == null) {
+                    return $q(async (resolve) => {
+                        if ($ctrl.condition == null || $ctrl.condition.leftSideValue == null || $ctrl.condition.leftSideValue === "") {
                             resolve("[Not Set]");
                         } else {
                             const value = await $injector.invoke($ctrl.conditionType.getLeftSideValueDisplay, {}, {
@@ -72,20 +72,20 @@
                 }
 
                 $ctrl.$onInit = function() {
-                    getRightSideValueDisplay().then(value => {
-                        $ctrl.rightSideValueDisplay = value;
+                    getRightSideValueDisplay().then((value) => {
+                        $ctrl.rightSideValueDisplay = value || "[Not Set]";
                     });
-                    getLeftSideValueDisplay().then(value => {
-                        $ctrl.leftSideValueDisplay = value;
+                    getLeftSideValueDisplay().then((value) => {
+                        $ctrl.leftSideValueDisplay = value || "[Not Set]";
                     });
                 };
 
                 $ctrl.$onChanges = function() {
-                    getRightSideValueDisplay().then(value => {
-                        $ctrl.rightSideValueDisplay = value;
+                    getRightSideValueDisplay().then((value) => {
+                        $ctrl.rightSideValueDisplay = value || "[Not Set]";
                     });
-                    getLeftSideValueDisplay().then(value => {
-                        $ctrl.leftSideValueDisplay = value;
+                    getLeftSideValueDisplay().then((value) => {
+                        $ctrl.leftSideValueDisplay = value || "[Not Set]";
                     });
                 };
             }