diff --git a/keyboards/keychron/v8/ansi_encoder/info.json b/keyboards/keychron/v8/ansi_encoder/info.json
index 36bcb137f7..09ab339f8b 100644
--- a/keyboards/keychron/v8/ansi_encoder/info.json
+++ b/keyboards/keychron/v8/ansi_encoder/info.json
@@ -6,7 +6,7 @@
     "usb": {
         "vid": "0x3434",
         "pid": "0x0381",
-        "device_version": "1.0.1"
+        "device_version": "1.0.2"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
@@ -15,7 +15,7 @@
     "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
-            {"pin_a": "A10", "pin_b": "B5"}
+            {"pin_a": "B5", "pin_b": "A10"}
         ]
     },
     "processor": "STM32L432",
diff --git a/keyboards/keychron/v8/iso_encoder/info.json b/keyboards/keychron/v8/iso_encoder/info.json
index b20eda227a..6dc19aee90 100644
--- a/keyboards/keychron/v8/iso_encoder/info.json
+++ b/keyboards/keychron/v8/iso_encoder/info.json
@@ -6,15 +6,16 @@
     "usb": {
         "vid": "0x3434",
         "pid": "0x0383",
-        "device_version": "1.0.1"
+        "device_version": "1.0.2"
     },
     "matrix_pins": {
         "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
         "rows": ["B4", "B3", "A15", "A14", "A13"]
     },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
-            {"pin_a": "A10", "pin_b": "B5"}
+            {"pin_a": "B5", "pin_b": "A10"}
         ]
     },
     "processor": "STM32L432",
diff --git a/quantum/encoder.c b/quantum/encoder.c
index 97baca9841..1413d5fc7d 100644
--- a/quantum/encoder.c
+++ b/quantum/encoder.c
@@ -277,12 +277,3 @@ void encoder_update_raw(uint8_t *slave_state) {
     if (changed) last_encoder_activity_trigger();
 }
 #endif
-
-void encoder_insert_state(void) {
-    for (uint8_t i = 0; i < thisCount; i++) {
-        encoder_state[i] <<= 2;
-        encoder_state[i] |= (readPin(encoders_pad_a[i]) << 0) | (readPin(encoders_pad_b[i]) << 1);
-        encoder_pulses[i] += encoder_LUT[encoder_state[i] & 0xF];
-        encoder_external_update[i] = true;
-    }
-}