diff --git a/src/core/analogsensor.cpp b/src/core/analogsensor.cpp
index 7ac9c793b..9428fcb36 100644
--- a/src/core/analogsensor.cpp
+++ b/src/core/analogsensor.cpp
@@ -600,7 +600,7 @@ bool AnalogSensor::update(uint8_t gpio, const char * org_name, double offset, do
 
 // check to see if values have been updated
 bool AnalogSensor::updated_values() {
-    if (changed_) {
+    if (changed_ && Mqtt::publish_queued() == 0) {
         changed_ = false;
         return true;
     }
diff --git a/src/core/temperaturesensor.cpp b/src/core/temperaturesensor.cpp
index e16d9103e..69f4d7b72 100644
--- a/src/core/temperaturesensor.cpp
+++ b/src/core/temperaturesensor.cpp
@@ -370,7 +370,7 @@ bool TemperatureSensor::update(const char * id, const char * name, int16_t offse
 
 // check to see if values have been updated
 bool TemperatureSensor::updated_values() {
-    if (changed_) {
+    if (changed_ && Mqtt::publish_queued() == 0) {
         changed_ = false;
         return true;
     }