diff --git a/src/src/Helpers/TaskValuesWriterHelper.cpp b/src/src/Helpers/TaskValuesWriterHelper.cpp
index 09bba33af..0ad54d1a3 100644
--- a/src/src/Helpers/TaskValuesWriterHelper.cpp
+++ b/src/src/Helpers/TaskValuesWriterHelper.cpp
@@ -214,10 +214,12 @@ void TaskValuesWriterHelper::pluginWebformShowValue()
     addHtmlDiv(F("div_br"));
   }
 
+#if FEATURE_STRING_VARIABLES
   if (hasPresentation) { value = presentation; }
   else if (!uom.isEmpty()) {
     value += concat(' ', uom);
   }
+#endif
 
   String valName_tmp(valName);
 
diff --git a/src/src/WebServer/JSON.cpp b/src/src/WebServer/JSON.cpp
index 1f952bb50..78b1a684a 100644
--- a/src/src/WebServer/JSON.cpp
+++ b/src/src/WebServer/JSON.cpp
@@ -638,12 +638,13 @@ void handle_json_stream_task_value_data(TaskValuesWriterHelper*data)
       writer->write(kv);
     }
 # endif // if FEATURE_STRING_VARIABLES
-
+#if FEATURE_TASKVALUE_UNIT_OF_MEASURE
     if (!data->uom.isEmpty()) {
       KeyValueStruct kv(F("UoM"), data->uom);
       kv.setID(data->uom_id);
       writer->write(kv);
     }
+#endif
   }
 }