diff --git a/quantum/quantum.c b/quantum/quantum.c
index 2053a1a5f..346ea4e03 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -630,9 +630,6 @@ void matrix_init_quantum() {
 #ifdef OUTPUT_AUTO_ENABLE
     set_output(OUTPUT_AUTO);
 #endif
-#ifdef DIP_SWITCH_ENABLE
-    dip_switch_init();
-#endif
 
     matrix_init_kb();
 }
diff --git a/tmk_core/common/keyboard.c b/tmk_core/common/keyboard.c
index 53d08959e..e2110363a 100644
--- a/tmk_core/common/keyboard.c
+++ b/tmk_core/common/keyboard.c
@@ -86,6 +86,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef VIA_ENABLE
 #    include "via.h"
 #endif
+#ifdef DIP_SWITCH_ENABLE
+#    include "dip_switch.h"
+#endif
 
 // Only enable this if console is enabled to print to
 #if defined(DEBUG_MATRIX_SCAN_RATE) && defined(CONSOLE_ENABLE)
@@ -269,6 +272,10 @@ void keyboard_init(void) {
     keymap_config.nkro = 1;
     eeconfig_update_keymap(keymap_config.raw);
 #endif
+#ifdef DIP_SWITCH_ENABLE
+    dip_switch_init();
+#endif
+
     keyboard_post_init_kb(); /* Always keep this last */
 }