diff --git a/src/hm/CommQueue.h b/src/hm/CommQueue.h
index dd82e82e..db00626a 100644
--- a/src/hm/CommQueue.h
+++ b/src/hm/CommQueue.h
@@ -12,9 +12,11 @@
 #include "../utils/dbg.h"
 
 #if !defined(ESP32)
-    #define vSemaphoreDelete(a)
-    #define xSemaphoreTake(a, b)
-    #define xSemaphoreGive(a)
+    #if !defined(vSemaphoreDelete)
+        #define vSemaphoreDelete(a)
+        #define xSemaphoreTake(a, b) { while(a) { yield(); } a = true; }
+        #define xSemaphoreGive(a) { a = false; }
+    #endif
 #endif
 
 template <uint8_t N=100>
diff --git a/src/publisher/pubMqtt.h b/src/publisher/pubMqtt.h
index 227a1310..4f567dcf 100644
--- a/src/publisher/pubMqtt.h
+++ b/src/publisher/pubMqtt.h
@@ -11,8 +11,11 @@
 #if defined(ENABLE_MQTT)
 #ifdef ESP8266
     #include <ESP8266WiFi.h>
-    #define xSemaphoreTake(a, b) { while(a) { yield(); } a = true; }
-    #define xSemaphoreGive(a) { a = false; }
+    #if !defined(vSemaphoreDelete)
+        #define vSemaphoreDelete(a)
+        #define xSemaphoreTake(a, b) { while(a) { yield(); } a = true; }
+        #define xSemaphoreGive(a) { a = false; }
+    #endif
 #elif defined(ESP32)
     #include <WiFi.h>
 #endif