diff --git a/ArduSub/Sub.cpp b/ArduSub/Sub.cpp
index 2726057596..12fb68337b 100644
--- a/ArduSub/Sub.cpp
+++ b/ArduSub/Sub.cpp
@@ -21,7 +21,7 @@ const AP_HAL::HAL& hal = AP_HAL::get_HAL();
   constructor for main Sub class
  */
 Sub::Sub(void) :
-    DataFlash {FIRMWARE_STRING},
+    DataFlash {FIRMWARE_STRING, g.log_bitmask},
           mission(ahrs,
                   FUNCTOR_BIND_MEMBER(&Sub::start_command, bool, const AP_Mission::Mission_Command &),
                   FUNCTOR_BIND_MEMBER(&Sub::verify_command_callback, bool, const AP_Mission::Mission_Command &),
diff --git a/ArduSub/system.cpp b/ArduSub/system.cpp
index 6003513d08..c632e2c7a2 100644
--- a/ArduSub/system.cpp
+++ b/ArduSub/system.cpp
@@ -291,10 +291,7 @@ bool Sub::optflow_position_ok()
 bool Sub::should_log(uint32_t mask)
 {
 #if LOGGING_ENABLED == ENABLED
-    if (!(mask & g.log_bitmask)) {
-        return false;
-    }
-    if (!DataFlash.should_log()) {
+    if (!DataFlash.should_log(mask)) {
         return false;
     }
     start_logging();