diff --git a/keyboards/crkbd/keymaps/rpbaptist/keymap.c b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
index c2b7f2809a8..bad4c9dfd7f 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/keymap.c
+++ b/keyboards/crkbd/keymaps/rpbaptist/keymap.c
@@ -165,8 +165,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 uint32_t layer_state_set_user(uint32_t state) {
-  state = update_tri_layer_state(state, _SYM, _NAV, _UTIL);
-  state = update_tri_layer_state(state, _GAMING_EXT, _NAV, _UTIL);
+  switch (biton32(default_layer_state)) {
+    case _COLEMAKDHM:
+      state = update_tri_layer_state(state, _SYM, _NAV, _UTIL);
+      break;
+    case _GAMING:
+      state = update_tri_layer_state(state, _GAMING_EXT, _NAV, _UTIL);
+      break;
+  }
   return state;
 }