5 files changed, 8 insertions, 7 deletions
diff --git a/keyboards/keychron/q1/ansi/info.json b/keyboards/keychron/q1/ansi/info.json
index 7b98521985..e4fbf055f2 100644
--- a/keyboards/keychron/q1/ansi/info.json
+++ b/keyboards/keychron/q1/ansi/info.json
@@ -6,7 +6,8 @@
     "usb": {
     	"vid": "0x3434",
     	"pid": "0x0100",
-    	"device_version": "1.0.0"
+    	"device_version": "1.0.0",
+        "force_nkro": true
     },
     "rgb_matrix": {
         "driver": "IS31FL3733"
diff --git a/keyboards/keychron/q1/ansi_encoder/info.json b/keyboards/keychron/q1/ansi_encoder/info.json
index 8220bd3323..d9e2fdff60 100644
--- a/keyboards/keychron/q1/ansi_encoder/info.json
+++ b/keyboards/keychron/q1/ansi_encoder/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x3434",
         "pid": "0x0101",
-        "device_version": "1.0.0"
+        "device_version": "1.0.0",
+        "force_nkro": true
     },
     "rgb_matrix": {
         "driver": "IS31FL3733"
diff --git a/keyboards/keychron/q1/config.h b/keyboards/keychron/q1/config.h
index a87754e9f2..c78453dc5f 100644
--- a/keyboards/keychron/q1/config.h
+++ b/keyboards/keychron/q1/config.h
@@ -27,9 +27,6 @@
 /* Disable DIP switch in matrix data */
 #define MATRIX_MASKED
 
-/* NKRO */
-#define FORCE_NKRO
-
 /* Disable RGB lighting when PC is in suspend */
 #define RGB_DISABLE_WHEN_USB_SUSPENDED
 
diff --git a/keyboards/keychron/q1/iso/info.json b/keyboards/keychron/q1/iso/info.json
index cc8f74bc75..a99ef16ba9 100644
--- a/keyboards/keychron/q1/iso/info.json
+++ b/keyboards/keychron/q1/iso/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x3434",
         "pid": "0x0102",
-        "device_version": "1.0.0"
+        "device_version": "1.0.0",
+        "force_nkro": true
     },
     "rgb_matrix": {
         "driver": "IS31FL3733"
diff --git a/keyboards/keychron/q1/iso_encoder/info.json b/keyboards/keychron/q1/iso_encoder/info.json
index 5bc470e102..38a5da1994 100644
--- a/keyboards/keychron/q1/iso_encoder/info.json
+++ b/keyboards/keychron/q1/iso_encoder/info.json
@@ -6,7 +6,8 @@
     "usb": {
         "vid": "0x3434",
         "pid": "0x0103",
-        "device_version": "1.0.2"
+        "device_version": "1.0.2",
+        "force_nkro": true
     },
     "rgb_matrix": {
         "driver": "IS31FL3733"