diff --git a/keyboards/splitkb/halcyon/elora/rev2/keyboard.json b/keyboards/splitkb/halcyon/elora/rev2/keyboard.json
index a6b4de34c8c..71057f915a1 100644
--- a/keyboards/splitkb/halcyon/elora/rev2/keyboard.json
+++ b/keyboards/splitkb/halcyon/elora/rev2/keyboard.json
@@ -1,9 +1,6 @@
 {
     "keyboard_name": "Halcyon Elora rev2",
     "bootloader": "rp2040",
-    "build": {
-        "lto": true
-    },
     "diode_direction": "COL2ROW",
     "encoder": {
         "enabled": true,
@@ -168,8 +165,9 @@
             "driver": "vendor"
         },
         "transport": {
-            "watchdog": true,
-            "watchdog_timeout": 3000
+            "sync": {
+                "matrix_state": true
+            }
         }
     },
     "usb": {
diff --git a/keyboards/splitkb/halcyon/elora/rev2/rev2.c b/keyboards/splitkb/halcyon/elora/rev2/rev2.c
new file mode 100644
index 00000000000..275f3f467b7
--- /dev/null
+++ b/keyboards/splitkb/halcyon/elora/rev2/rev2.c
@@ -0,0 +1,26 @@
+// Copyright 2024 splitkb.com (support@splitkb.com)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#ifdef ENCODER_ENABLE
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+
+    if (index == 0) {
+        // Volume control
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) {
+        // Page up/Page down
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    return false;
+}
+#endif
\ No newline at end of file