diff --git a/keyboards/ymdk_np21/ymdk_np21.h b/keyboards/ymdk_np21/ymdk_np21.h
index bdc37231ee..7434cf016d 100644
--- a/keyboards/ymdk_np21/ymdk_np21.h
+++ b/keyboards/ymdk_np21/ymdk_np21.h
@@ -50,15 +50,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LAYOUT_numpad_6x4( \
     k00,  k10,  k20,  k30, \
     k01,  k11,  k21,  k31, \
-    k02,  k12,  k22,\
-    k03,  k13,  k23,  k33, \
+    k02,  k12,  k22, \
+    k03,  k13,  k23,  k32, \
     k04,  k14,  k24, \
-    k05,        k25,  k35 \
+    k05,        k25,  k34 \
 ) { \
     { k00, k01, k02, k03, k04, k05 }, \
     { k10, k11, k12, k13, k14, XXX }, \
     { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, XXX, k33, XXX, k35 } \
+    { k30, k31, k32, XXX, k34, XXX } \
 }
 
 #define LAYOUT LAYOUT_ortho_4x6