diff --git a/src/modules/mavlink/mavlink_log_handler.cpp b/src/modules/mavlink/mavlink_log_handler.cpp
index dcc7a601e5..12d889d46f 100644
--- a/src/modules/mavlink/mavlink_log_handler.cpp
+++ b/src/modules/mavlink/mavlink_log_handler.cpp
@@ -349,6 +349,10 @@ LogListHelper::LogListHelper()
 //-------------------------------------------------------------------
 LogListHelper::~LogListHelper()
 {
+	if (current_log_filep) {
+		::fclose(current_log_filep);
+	}
+
 	// Remove log data files (if any)
 	unlink(kLogData);
 	unlink(kTmpData);