diff --git a/src/analogsensor.cpp b/src/analogsensor.cpp
index 469765075..39902f7f1 100644
--- a/src/analogsensor.cpp
+++ b/src/analogsensor.cpp
@@ -711,7 +711,7 @@ bool AnalogSensor::get_value_info(JsonObject output, const char * cmd, const int
         }
     }
 
-    return EMSESP::return_not_found(output, "analog sensor", cmd); // not found
+    return EMSESP::return_not_found(output, cmd, F_(analogsensor)); // not found
 }
 
 void AnalogSensor::addSensorJson(JsonObject output, const Sensor & sensor) {
diff --git a/src/temperaturesensor.cpp b/src/temperaturesensor.cpp
index 3e703e798..6919cc054 100644
--- a/src/temperaturesensor.cpp
+++ b/src/temperaturesensor.cpp
@@ -408,7 +408,7 @@ bool TemperatureSensor::get_value_info(JsonObject output, const char * cmd, cons
         }
     }
 
-    return EMSESP::return_not_found(output, "temperature sensor", cmd); // not found
+    return EMSESP::return_not_found(output, cmd, F_(temperaturesensor)); // not found
 }
 
 void TemperatureSensor::addSensorJson(JsonObject output, const Sensor & sensor) {
diff --git a/src/web/WebCustomEntityService.cpp b/src/web/WebCustomEntityService.cpp
index 408b6279b..612f86b64 100644
--- a/src/web/WebCustomEntityService.cpp
+++ b/src/web/WebCustomEntityService.cpp
@@ -334,7 +334,7 @@ bool WebCustomEntityService::get_value_info(JsonObject output, const char * cmd)
         }
     }
 
-    return EMSESP::return_not_found(output, "custom entity", cmd); // not found
+    return EMSESP::return_not_found(output, cmd, F_(custom)); // not found
 }
 
 // publish single value
diff --git a/src/web/WebSchedulerService.cpp b/src/web/WebSchedulerService.cpp
index 80c143920..e9a942749 100644
--- a/src/web/WebSchedulerService.cpp
+++ b/src/web/WebSchedulerService.cpp
@@ -206,7 +206,7 @@ bool WebSchedulerService::get_value_info(JsonObject output, const char * cmd) {
         return true;
     }
 
-    return EMSESP::return_not_found(output, "schedule", cmd); // not found
+    return EMSESP::return_not_found(output, cmd, F_(scheduler)); // not found
 }
 
 // publish single value