diff --git a/SConstruct b/SConstruct
index b4c8d7b2903..12796796888 100644
--- a/SConstruct
+++ b/SConstruct
@@ -234,7 +234,7 @@ firmware_debug = distenv.PhonyTarget(
 )
 distenv.Depends(firmware_debug, firmware_flash)
 
-distenv.PhonyTarget(
+firmware_blackmagic = distenv.PhonyTarget(
     "blackmagic",
     "${GDBPYCOM}",
     source=firmware_env["FW_ELF"],
@@ -242,6 +242,7 @@ distenv.PhonyTarget(
     GDBREMOTE="${BLACKMAGIC_ADDR}",
     FBT_FAP_DEBUG_ELF_ROOT=firmware_env["FBT_FAP_DEBUG_ELF_ROOT"],
 )
+distenv.Depends(firmware_blackmagic, firmware_flash)
 
 # Debug alien elf
 debug_other_opts = [
diff --git a/scripts/debug/flipperapps.py b/scripts/debug/flipperapps.py
index 6dba89a5640..81aa43c34cf 100644
--- a/scripts/debug/flipperapps.py
+++ b/scripts/debug/flipperapps.py
@@ -124,7 +124,7 @@ def invoke(self, arg, from_tty):
             print(f"Set '{arg}' as debug info lookup path for Flipper external apps")
             helper.attach_to_fw()
             gdb.events.stop.connect(helper.handle_stop)
-            gdb.events.exited.connect(helper.handle_exit)
+            gdb.events.gdb_exiting.connect(helper.handle_exit)
         except gdb.error as e:
             print(f"Support for Flipper external apps debug is not available: {e}")