diff --git a/furi/core/core_defines.h b/furi/core/core_defines.h
index 801810f6a..487fe2ca3 100644
--- a/furi/core/core_defines.h
+++ b/furi/core/core_defines.h
@@ -85,7 +85,11 @@ extern "C" {
 #endif
 
 #ifndef FURI_BIT_SET
-#define FURI_BIT_SET(x, n) ((x) |= (1 << (n)))
+#define FURI_BIT_SET(x, n)      \
+    ({                          \
+        __typeof__(x) _x = (1); \
+        (x) |= (_x << (n));     \
+    })
 #endif
 
 #ifndef FURI_BIT_CLEAR