diff --git a/libraries/AP_Logger/LogFile.cpp b/libraries/AP_Logger/LogFile.cpp
index 13822d0721..5ea17a010d 100644
--- a/libraries/AP_Logger/LogFile.cpp
+++ b/libraries/AP_Logger/LogFile.cpp
@@ -655,10 +655,13 @@ void AP_Logger::Write_Current_instance(const uint64_t time_us,
 // Write an Current data packet
 void AP_Logger::Write_Current()
 {
+    AP_BattMonitor &battery = AP::battery();
     const uint64_t time_us = AP_HAL::micros64();
     const uint8_t num_instances = AP::battery().num_instances();
     for (uint8_t i = 0; i < num_instances; i++) {
-        Write_Current_instance(time_us, i);
+        if (battery.get_type(i) != AP_BattMonitor::Type::NONE) {
+            Write_Current_instance(time_us, i);
+        }
     }
 }