diff --git a/utils/equipment.js b/utils/equipment.js
index 7364bb8..87decec 100644
--- a/utils/equipment.js
+++ b/utils/equipment.js
@@ -25,7 +25,13 @@ class Equipment {
         } else if (items[valueItemName]['state'] == 'NULL') {           // Return default value if item state is null
             console.warn('Item ' + valueItemName + ' is unset')
         } else {                                                        // Return value from item
-            returnValue = items[valueItemName]['state'];
+            if (items[valueItemName].quantityState == null && items[valueItemName].numericState == null) {
+                returnValue = items[valueItemName]['state'];                
+            } else if (items[valueItemName].quantityState == null) {
+                returnValue = items[valueItemName]['numericState']
+            } else {
+                returnValue = items[valueItemName].quantityState;
+            }
         }       
 
         console.debug('Return value ' +  valueName + ' for ' + this.name + ': ' + returnValue);