diff --git a/users/t4corun/features/combo.c b/users/t4corun/features/combo.c
index b0b99ac4..e2aa3291 100644
--- a/users/t4corun/features/combo.c
+++ b/users/t4corun/features/combo.c
@@ -25,13 +25,13 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) {
 bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
 
   // disable all combos on config layer
-  if ( get_highest_layer(layer_state) == _CONFIG ) return false;
+  if ( get_highest_layer(layer_state | default_layer_state) == _CONFIG ) return false;
 
   switch (combo_index) {
 
     case KEY_ENT:
     case KEY_TAB:
-      if ( get_highest_layer(layer_state) == _SYMBOL ) return false;
+      if ( get_highest_layer(layer_state | default_layer_state) == _SYMBOL ) return false;
 
     case MOUSE_BUTTON1:
     case MOUSE_BUTTON2:
@@ -39,11 +39,10 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode
     case MOUSE_BUTTON4:
     case MOUSE_BUTTON5:
     case MOUSE_DRGTOG:
-      if ( get_highest_layer(layer_state) > _DEFAULT_LAYER_1 ) return false;
+      if ( get_highest_layer(layer_state | default_layer_state) > _DEFAULT_LAYER_1 ) return false;
 
     default:
       return true;
-
   }
 
 }
\ No newline at end of file