diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51caf710f..e5413f72a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,11 +5,13 @@
 - Nothing
 
 ### Fixed:
+- CLI:
+  - Fix crash when opening CLI/qFlipper/WebUpdater if some unexpected files are present in `/ext/apps_data/cli/plugins` (by @WillyJL)
+  - OFW: Fix subghz chat command (by @GameLord2011)
 - Sub-GHz:
   - UL: Fix CAME 24bit decoder (by @xMasterX)
   - UL: Tune holtek ht12x to decode holtek only and not conflict with came 12bit (by @xMasterX)
   - UL: Fix Rename scene bug, that was replacing file name with random name when Rename is opened then closed then opened again (by @xMasterX)
-- OFW: CLI: Fix subghz chat command (by @GameLord2011)
 
 ### Removed:
 - Nothing
diff --git a/lib/toolbox/cli/cli_registry.c b/lib/toolbox/cli/cli_registry.c
index 91f7c4046..45661ee90 100644
--- a/lib/toolbox/cli/cli_registry.c
+++ b/lib/toolbox/cli/cli_registry.c
@@ -136,9 +136,9 @@ void cli_registry_reload_external_commands(
             FURI_LOG_T(TAG, "Plugin: %s", plugin_filename);
             furi_string_set_str(plugin_name, plugin_filename);
 
-            furi_check(furi_string_end_with_str(plugin_name, ".fal"));
+            if(!furi_string_end_with_str(plugin_name, ".fal")) continue;
             furi_string_replace_all_str(plugin_name, ".fal", "");
-            furi_check(furi_string_start_with_str(plugin_name, config->fal_prefix));
+            if(!furi_string_start_with_str(plugin_name, config->fal_prefix)) continue;
             furi_string_replace_at(plugin_name, 0, strlen(config->fal_prefix), "");
 
             CliRegistryCommand command = {