diff --git a/keyboards/framework/numpad/keymaps/default/keymap.c b/keyboards/framework/numpad/keymaps/default/keymap.c
index 07acb00b74..5ef122bacc 100644
--- a/keyboards/framework/numpad/keymaps/default/keymap.c
+++ b/keyboards/framework/numpad/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-// Copyright 2022 Framework Computer
+// Copyright 2022-2023 Framework Computer
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
@@ -20,19 +20,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *         └─────────┴────┴────┴
      * 21 total
      */
-    [0] = LAYOUT(
+    [_NUMLOCK] = LAYOUT(
         KC_ESC,  KC_CALC, KC_EQL,  KC_BSPC,
-        TG(1),   KC_PSLS, KC_PAST, KC_PMNS,
+        KC_NUM,  KC_PSLS, KC_PAST, KC_PMNS,
         KC_P7,   KC_P8,   KC_P9,
         KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
         KC_P1,   KC_P2,   KC_P3,
             KC_P0,        KC_PDOT, KC_PENT
     ),
      /*
-     * Simulating numlock so that we can use extra keys for special functions.
-     * Keeping actual numlock in case users want to toggle OS state.
+     * Extra keys for when numlock is disabled.
+     * Numlock keys are passed through to the number layer,
+     * and automatically remapped by the OS.
      *         ┌────┬────┬────┬────┐
-     *  4 keys │    │    │    │ Num│
+     *  4 keys │    │    │    │    │
      *         ├────┼────┼────┼────┤
      *  4 keys │    │    │    │    │
      *         ├────┼────┼────┼────┤
@@ -46,14 +47,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *         └─────────┴────┴────┴
      * 21 total
      */
-    [1] = LAYOUT(
-        _______, _______, _______, KC_NUM,
+    [_FN] = LAYOUT(
         _______, _______, _______, _______,
-        KC_HOME, KC_UP,   KC_PGUP,
-        KC_LEFT, _______, KC_RGHT, BL_BRTG,
-        KC_END,  KC_DOWN, KC_PGDN,
-            KC_INS,       KC_DEL,  BL_STEP
+        _______, _______, _______, _______,
+        _______, _______, _______,
+        _______, _______, _______, BL_BRTG,
+        _______, _______, _______,
+            _______,      _______, BL_STEP
 
     )
 
 };
+
+bool led_update_user(led_t led_state) {
+    // Change layer if numlock state changes, either triggered by OS or
+    // by numlock key on this keyboard
+    if (led_state.num_lock) {
+        layer_on(_NUMLOCK);
+    } else {
+        layer_off(_FN);
+    }
+    return true;
+}
diff --git a/keyboards/framework/numpad/numpad.c b/keyboards/framework/numpad/numpad.c
new file mode 100644
index 0000000000..2838df5391
--- /dev/null
+++ b/keyboards/framework/numpad/numpad.c
@@ -0,0 +1,14 @@
+// Copyright 2023 Framework Computer
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "quantum.h"
+#include "numpad.h"
+
+void keyboard_post_init_user(void) {
+    // Sync initial numlock state from the host
+    if (host_keyboard_led_state().num_lock) {
+        layer_on(_NUMLOCK);
+    } else {
+        layer_off(_FN);
+    }
+}
diff --git a/keyboards/framework/numpad/numpad.h b/keyboards/framework/numpad/numpad.h
index 942f0e1104..aec24bf957 100644
--- a/keyboards/framework/numpad/numpad.h
+++ b/keyboards/framework/numpad/numpad.h
@@ -1,4 +1,4 @@
-// Copyright 2022 Framework Computer
+// Copyright 2022-2023 Framework Computer
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 // Same as macropad with a few keys removed
@@ -16,3 +16,8 @@
   {  K108,    H1,    H2, KC_NO,    H4, KC_NO, KC_NO, KC_NO }, \
   { KC_NO, KC_NO, KC_NO, KC_NO,    H3, KC_NO, KC_NO, KC_NO }, \
 }
+
+enum _layers {
+  _NUMLOCK,
+  _FN
+};