diff --git a/tasmota/tasmota_globals.h b/tasmota/tasmota_globals.h
index 109a1e505..f32c233d6 100644
--- a/tasmota/tasmota_globals.h
+++ b/tasmota/tasmota_globals.h
@@ -394,8 +394,8 @@ const char kWebColors[] PROGMEM =
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 #endif
 
-#define AGPIO(x) (x<<5)
-#define BGPIO(x) (x>>5)
+#define AGPIO(x) ((x)<<5)
+#define BGPIO(x) ((x)>>5)
 
 #ifdef USE_DEVICE_GROUPS
 #define SendDeviceGroupMessage(DEVICE_INDEX, REQUEST_TYPE, ...) _SendDeviceGroupMessage(DEVICE_INDEX, REQUEST_TYPE, __VA_ARGS__, 0)