diff --git a/src/main/blackbox/blackbox.c b/src/main/blackbox/blackbox.c
index adfafdea2c..29a4d3a338 100644
--- a/src/main/blackbox/blackbox.c
+++ b/src/main/blackbox/blackbox.c
@@ -71,12 +71,6 @@
 #include "sensors/gyro.h"
 #include "sensors/rangefinder.h"
 
-enum {
-    BLACKBOX_MODE_NORMAL = 0,
-    BLACKBOX_MODE_MOTOR_TEST,
-    BLACKBOX_MODE_ALWAYS_ON
-};
-
 #if defined(ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT)
 #define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
 #elif defined(ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT)
diff --git a/src/main/blackbox/blackbox.h b/src/main/blackbox/blackbox.h
index e5b96b03be..045682de7c 100644
--- a/src/main/blackbox/blackbox.h
+++ b/src/main/blackbox/blackbox.h
@@ -33,6 +33,12 @@ typedef enum BlackboxDevice {
     BLACKBOX_DEVICE_SERIAL = 3
 } BlackboxDevice_e;
 
+typedef enum BlackboxMode {
+    BLACKBOX_MODE_NORMAL = 0,
+    BLACKBOX_MODE_MOTOR_TEST,
+    BLACKBOX_MODE_ALWAYS_ON
+} BlackboxMode;
+
 typedef enum FlightLogEvent {
     FLIGHT_LOG_EVENT_SYNC_BEEP = 0,
     FLIGHT_LOG_EVENT_INFLIGHT_ADJUSTMENT = 13,
diff --git a/src/main/fc/fc_core.c b/src/main/fc/fc_core.c
index cc373316b8..996384a973 100644
--- a/src/main/fc/fc_core.c
+++ b/src/main/fc/fc_core.c
@@ -280,7 +280,7 @@ void disarm(void)
         DISABLE_ARMING_FLAG(ARMED);
 
 #ifdef USE_BLACKBOX
-        if (blackboxConfig()->device) {
+        if (blackboxConfig()->device && blackboxConfig()->mode != BLACKBOX_MODE_ALWAYS_ON) { // Close the log upon disarm except when logging mode is ALWAYS ON
             blackboxFinish();
         }
 #endif