diff --git a/keyboards/clueboard/2x1800/2019/2019.h b/keyboards/clueboard/2x1800/2019/2019.h
index 5debfacc5d6..21ca93f4c47 100644
--- a/keyboards/clueboard/2x1800/2019/2019.h
+++ b/keyboards/clueboard/2x1800/2019/2019.h
@@ -17,17 +17,6 @@
 
 #include "quantum.h"
 
-enum TWOx1800_keycodes {
-    ENC_BTN1 = SAFE_RANGE,
-    ENC_BTN2,
-    ENC_BTN3,
-    ENC_BTN4,
-    NEW_SAFE_RANGE
-};
-
-#undef SAFE_RANGE
-#define SAFE_RANGE NEW_SAFE_RANGE
-
 // Encoder update function that returns true/false
 bool encoder_update_keymap(uint8_t index, bool clockwise);
 
diff --git a/keyboards/clueboard/2x1800/2019/info.json b/keyboards/clueboard/2x1800/2019/info.json
index 26185b7a482..30c2b1f8f4b 100644
--- a/keyboards/clueboard/2x1800/2019/info.json
+++ b/keyboards/clueboard/2x1800/2019/info.json
@@ -7,6 +7,7 @@
   "debounce": 5,
   "processor": "at90usb1286",
   "bootloader": "halfkay",
+  "custom_keycodes": ["ENC_BTN1", "ENC_BTN2", "ENC_BTN3", "ENC_BTN4"],
   "diode_direction": "ROW2COL",
   "features": {
     "audio": true,