diff --git a/MAVProxy/mavproxy.py b/MAVProxy/mavproxy.py
index 88a3ccf9d4..958a1821ea 100644
--- a/MAVProxy/mavproxy.py
+++ b/MAVProxy/mavproxy.py
@@ -910,7 +910,7 @@ def mkdir_p(dir):
 
 def log_writer():
     '''log writing thread'''
-    while True:
+    while not mpstate.status.exit:
         mpstate.logfile_raw.write(bytearray(mpstate.logqueue_raw.get()))
         timeout = time.time() + 10
         while not mpstate.logqueue_raw.empty() and time.time() < timeout: