diff --git a/sonoff/xdrv_01_mqtt.ino b/sonoff/xdrv_01_mqtt.ino
index 8afcf672b..e91e56f16 100644
--- a/sonoff/xdrv_01_mqtt.ino
+++ b/sonoff/xdrv_01_mqtt.ino
@@ -92,7 +92,9 @@ void MqttSubscribeLib(char *topic)
 
 bool MqttPublishLib(const char* topic, boolean retained)
 {
-  return MqttClient.publish(topic, mqtt_data, retained);
+  bool result = MqttClient.publish(topic, mqtt_data, retained);
+  yield();  // #3313
+  return result;
 }
 
 void MqttLoop()
@@ -231,8 +233,6 @@ void MqttPublishDirect(const char* topic, boolean retained)
   if (Settings.ledstate &0x04) {
     blinks++;
   }
-
-  yield();  // #3313
 }
 
 void MqttPublish(const char* topic, boolean retained)