diff --git a/src/comm/MAVLinkProtocol.cc b/src/comm/MAVLinkProtocol.cc
index deadbd219bd1369ad452cff720f39157f7c643de..d221dc26e255633b0b062de16e496418b21b8415 100644
--- a/src/comm/MAVLinkProtocol.cc
+++ b/src/comm/MAVLinkProtocol.cc
@@ -187,6 +187,13 @@ void MAVLinkProtocol::_linkStatusChanged(LinkInterface* link, bool connected)
         // Use the same shared pointer as LinkManager
         _connectedLinks.append(LinkManager::instance()->sharedPointerForLink(link));
         
+#ifndef __mobile__
+        if (_connectedLinks.count() == 1) {
+            // This is the first link, we need to start logging
+            _startLogging();
+        }
+#endif
+        
         // Send command to start MAVLink
         // XXX hacky but safe
         // Start NSH
@@ -346,11 +353,6 @@ void MAVLinkProtocol::receiveBytes(LinkInterface* link, QByteArray b)
 #endif
 
             if (message.msgid == MAVLINK_MSG_ID_HEARTBEAT) {
-#ifndef __mobile__
-                // Start logging on first heartbeat
-                _startLogging();
-#endif
-
                 // Notify the vehicle manager of the heartbeat. This will create/update vehicles as needed.
                 mavlink_heartbeat_t heartbeat;
                 mavlink_msg_heartbeat_decode(&message, &heartbeat);
@@ -644,20 +646,20 @@ bool MAVLinkProtocol::_closeLogFile(void)
 
 void MAVLinkProtocol::_startLogging(void)
 {
-    if (!_tempLogFile.isOpen()) {
-        if (!_logSuspendReplay) {
-            if (!_tempLogFile.open()) {
-                emit protocolStatusMessage(tr("MAVLink Protocol"), tr("Opening Flight Data file for writing failed. "
-                                                                      "Unable to write to %1. Please choose a different file location.").arg(_tempLogFile.fileName()));
-                _closeLogFile();
-                _logSuspendError = true;
-                return;
-            }
-
-            qDebug() << "Temp log" << _tempLogFile.fileName();
+    Q_ASSERT(!_tempLogFile.isOpen());
 
-            _logSuspendError = false;
+    if (!_logSuspendReplay) {
+        if (!_tempLogFile.open()) {
+            emit protocolStatusMessage(tr("MAVLink Protocol"), tr("Opening Flight Data file for writing failed. "
+                                                                  "Unable to write to %1. Please choose a different file location.").arg(_tempLogFile.fileName()));
+            _closeLogFile();
+            _logSuspendError = true;
+            return;
         }
+    
+        qDebug() << "Temp log" << _tempLogFile.fileName();
+        
+        _logSuspendError = false;
     }
 }