diff --git a/keyboards/keychron/q6_custom/iso_encoder/keymaps/keychron/config.h b/keyboards/keychron/q6_custom/iso_encoder/keymaps/keychron/config.h
index c6a389cb0a26..5b62ac6740df 100644
--- a/keyboards/keychron/q6_custom/iso_encoder/keymaps/keychron/config.h
+++ b/keyboards/keychron/q6_custom/iso_encoder/keymaps/keychron/config.h
@@ -74,3 +74,6 @@
 /* Make tap and hold keys work better for fast typists */
 #define HOLD_ON_OTHER_KEY_PRESS
 // Immediately decide on hold instead of tap (without waiting the tapping term) if another key is pressed
+
+/* Ensure a correct keyboard protocol (and thus NKRO) on machines with dual-boot */
+#define OS_DETECTION_KEYBOARD_RESET
diff --git a/keyboards/keychron/q6_custom/iso_encoder/keymaps/keychron/rules.mk b/keyboards/keychron/q6_custom/iso_encoder/keymaps/keychron/rules.mk
index f31fe01594e1..3f7fab97d3b2 100644
--- a/keyboards/keychron/q6_custom/iso_encoder/keymaps/keychron/rules.mk
+++ b/keyboards/keychron/q6_custom/iso_encoder/keymaps/keychron/rules.mk
@@ -4,5 +4,7 @@ ENCODER_MAP_ENABLE = yes
 MOUSE_SHARED_EP = no
 KEYBOARD_SHARED_EP = no
 
+OS_DETECTION_ENABLE = yes
+
 VPATH += keyboards/keychron/common
 SRC += keychron_common.c