diff --git a/users/halcyon_modules/config.h b/users/halcyon_modules/config.h
index 0b88d0db..7ed00fd5 100644
--- a/users/halcyon_modules/config.h
+++ b/users/halcyon_modules/config.h
@@ -52,13 +52,19 @@
 #define SPLIT_TRANSPORT_MIRROR
 #define SPLIT_LED_STATE_ENABLE
 #define SPLIT_LAYER_STATE_ENABLE
+#ifndef HLC_ENCODER_A
+#   define HLC_ENCODER_A NO_PIN
+#endif
+#ifndef HLC_ENCODER_B
+#   define HLC_ENCODER_B NO_PIN
+#endif
 
 // Kyria
-#if defined(PRODUCT_ID) && PRODUCT_ID == 0x7FCE
+#if PRODUCT_ID == 0x7FCE
     #undef ENCODER_A_PINS
-    #define ENCODER_A_PINS { GP23, GP27 }
+    #define ENCODER_A_PINS { GP23, HLC_ENCODER_A }
     #undef ENCODER_B_PINS
-    #define ENCODER_B_PINS { GP22, GP26 }
+    #define ENCODER_B_PINS { GP22, HLC_ENCODER_B }
     #undef MATRIX_ROWS
     #define MATRIX_ROWS 10
     #define LAYOUT_split_3x6_5_hlc(k0G, k0F, k0E, k0D, k0C, k0B, k5B, k5C, k5D, k5E, k5F, k5G, k1G, k1F, k1E, k1D, k1C, k1B, k6B, k6C, k6D, k6E, k6F, k6G, k2G, k2F, k2E, k2D, k2C, k2B, k3D, k2A, k7A, k8D, k7B, k7C, k7D, k7E, k7F, k7G, k3E, k3C, k3B, k3F, k3A, k8A, k8F, k8B, k8C, k8E, k4A, k4B, k4C, k4D, k4E, k9A, k9B, k9C, k9D, k9E) { \
diff --git a/users/halcyon_modules/halcyon.c b/users/halcyon_modules/halcyon.c
index 3b71794e..8b00e678 100644
--- a/users/halcyon_modules/halcyon.c
+++ b/users/halcyon_modules/halcyon.c
@@ -94,7 +94,7 @@ report_mouse_t pointing_device_task_combined_kb(report_mouse_t left_report, repo
 }
 
 // Kyria
-#if defined(PRODUCT_ID) && PRODUCT_ID == 0x7FCE
+#if PRODUCT_ID == 0x7FCE
 #ifdef RGB_MATRIX_ENABLE
 #include "rgb_matrix.h"
 led_config_t g_led_config = {
diff --git a/users/halcyon_modules/hlc_encoder/config.h b/users/halcyon_modules/hlc_encoder/config.h
index 02188489..44fe802d 100644
--- a/users/halcyon_modules/hlc_encoder/config.h
+++ b/users/halcyon_modules/hlc_encoder/config.h
@@ -6,4 +6,7 @@
 #pragma once
 
 #define HLC_ENCODER
-#define HLC_ENCODER_BUTTON GP16
\ No newline at end of file
+
+#define HLC_ENCODER_BUTTON GP16
+#define HLC_ENCODER_A GP27
+#define HLC_ENCODER_B GP26
\ No newline at end of file