diff --git a/.gitignore b/.gitignore
index b9f3806..db18c4e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 .pio
 .vscode
+null.o
+_codeql_detected_source_root
diff --git a/src/SerialMuxProtCommon.hpp b/src/SerialMuxProtCommon.hpp
index 5da9471..765d71a 100644
--- a/src/SerialMuxProtCommon.hpp
+++ b/src/SerialMuxProtCommon.hpp
@@ -186,5 +186,8 @@ typedef struct _ControlChannelPayload
     char     channelName[CHANNEL_NAME_MAX_LEN] = {0U}; /**< Channel Name */
 } __attribute__((packed)) ControlChannelPayload;       /**< ControlChannelPayload */
 
+static_assert(MAX_DATA_LEN >= sizeof(ControlChannelPayload),
+              "MAX_DATA_LEN must be >= sizeof(ControlChannelPayload) to avoid buffer overflows on control channel.");
+
 #endif /* SERIALMUXPROT_COMMON_H_ */
 /** @} */