diff --git a/src/ui/QGCMAVLinkLogPlayer.cc b/src/ui/QGCMAVLinkLogPlayer.cc
index 1a4364fd36d35828d5bf974604f7d4c210330520..7624ce2888f1c19f2206936de46a4d3c9796b105 100644
--- a/src/ui/QGCMAVLinkLogPlayer.cc
+++ b/src/ui/QGCMAVLinkLogPlayer.cc
@@ -119,6 +119,13 @@ void QGCMAVLinkLogPlayer::setAccelerationFactorInt(int factor)
 
 void QGCMAVLinkLogPlayer::loadLogFile(const QString& file)
 {
+    // Check if logging is still enabled
+    if (mavlink->loggingEnabled())
+    {
+        mavlink->enableLogging(false);
+        MainWindow::instance()->showInfoMessage(tr("MAVLink Logging Stopped during Replay"), tr("MAVLink logging has been stopped during the log replay. To re-enable logging, use the link properties in the communication menu."));
+    }
+
     // Ensure that the playback process is stopped
     if (logFile.isOpen())
     {