1 files changed, 10 insertions, 0 deletions

diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index e2110363a..714c3d048 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -53,6 +53,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGBLIGHT_ENABLE
 #    include "rgblight.h"
 #endif
+#ifdef ENCODER_ENABLE
+#    include "encoder.h"
+#endif
 #ifdef STENO_ENABLE
 #    include "process_steno.h"
 #endif
@@ -259,6 +262,9 @@ void keyboard_init(void) {
 #ifdef RGBLIGHT_ENABLE
     rgblight_init();
 #endif
+#ifdef ENCODER_ENABLE
+    encoder_init();
+#endif
 #ifdef STENO_ENABLE
     steno_init();
 #endif
@@ -359,6 +365,10 @@ MATRIX_LOOP_END:
 #    endif
 #endif
 
+#ifdef ENCODER_ENABLE
+    encoder_read();
+#endif
+
 #ifdef QWIIC_ENABLE
     qwiic_task();
 #endif