diff --git a/apps/action.c b/apps/action.c
index 4504b97ff2..392f2c344c 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -588,13 +588,14 @@ static inline int get_next_context(const struct button_mapping *items, int i)
 *  for a more in-depth explanation
 * places action into current_action
 */
+
 static inline void action_code_lookup(action_last_t *last, action_cur_t *cur)
 {
     int  action, i;
     int  context = cur->context;
     cur->is_prebutton = false;
 
-#ifdef HAVE_LOCKED_ACTIONS
+#if defined(HAVE_LOCKED_ACTIONS) && !defined(HAS_BUTTON_HOLD)
     /* This only applies to the first context, to allow locked contexts to
      * specify a fall through to their non-locked version */
     if (is_keys_locked())
diff --git a/firmware/export/config/sansaclipv2.h b/firmware/export/config/sansaclipv2.h
index f2b1115c81..6e369db681 100644
--- a/firmware/export/config/sansaclipv2.h
+++ b/firmware/export/config/sansaclipv2.h
@@ -69,7 +69,6 @@
 #define HAVE_LCD_ENABLE
 
 #ifndef BOOTLOADER
-#define HAVE_LOCKED_ACTIONS
 /* Define this if your LCD can be put to sleep.
  * HAVE_LCD_ENABLE should be defined as well. */
 //#define HAVE_LCD_SLEEP