diff --git a/keyboards/draytronics/daisy_v2/keymaps/default/keymap.c b/keyboards/draytronics/daisy_v2/keymaps/default/keymap.c
index 007840e55e3..8039d6bdcd8 100644
--- a/keyboards/draytronics/daisy_v2/keymaps/default/keymap.c
+++ b/keyboards/draytronics/daisy_v2/keymaps/default/keymap.c
@@ -84,11 +84,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     */
 };
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (clockwise) {
-        tap_code(KC_VOLD);
-    } else {
-        tap_code(KC_VOLU);
-    }
-    return false;
-}
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [_BASE] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)  },
+    [_CODE] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)  },
+};
+#endif
diff --git a/keyboards/draytronics/daisy_v2/rules.mk b/keyboards/draytronics/daisy_v2/rules.mk
index dbfa81b6ce0..f2ba6e18ca1 100644
--- a/keyboards/draytronics/daisy_v2/rules.mk
+++ b/keyboards/draytronics/daisy_v2/rules.mk
@@ -1 +1,2 @@
+ENCODER_MAP_ENABLE = yes
 SRC += oled.c