diff --git a/src/Vehicle/MavlinkLogManager.cc b/src/Vehicle/MavlinkLogManager.cc
index bc9e14daa630655d56491ee8838fcb27ea559f96..7da59ae9a7192ac8743b3615d7b222bf6b805914 100644
--- a/src/Vehicle/MavlinkLogManager.cc
+++ b/src/Vehicle/MavlinkLogManager.cc
@@ -460,7 +460,9 @@ MavlinkLogManager::_sendLog(const QString& logFile)
     multiPart->append(logPart);
     file->setParent(multiPart);
     QNetworkRequest request(_uploadURL);
+#if QT_VERSION > 0x050600
     request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
+#endif
     QNetworkReply* reply = _nam->post(request, multiPart);
     connect(reply, &QNetworkReply::finished,  this, &MavlinkLogManager::_uploadFinished);
     connect(this, &MavlinkLogManager::abortUpload, reply, &QNetworkReply::abort);
diff --git a/src/ui/preferences/MavlinkSettings.qml b/src/ui/preferences/MavlinkSettings.qml
index 836e902fd7ad1a0c1c3c80b4fa1c40a2d4fd9f91..3beaa6067986f66e66cc6bb2d81245b9155041b8 100644
--- a/src/ui/preferences/MavlinkSettings.qml
+++ b/src/ui/preferences/MavlinkSettings.qml
@@ -25,22 +25,28 @@ Rectangle {
     color:          qgcPal.window
     anchors.fill:   parent
 
-    property real _labelWidth:      ScreenTools.defaultFontPixelWidth * 28
-    property real _valueWidth:      ScreenTools.defaultFontPixelWidth * 24
-    property int  _selectedCount:   0
-    property real _columnSpacing:   ScreenTools.defaultFontPixelHeight * 0.25
-
+    property real _labelWidth:          ScreenTools.defaultFontPixelWidth * 28
+    property real _valueWidth:          ScreenTools.defaultFontPixelWidth * 24
+    property int  _selectedCount:       0
+    property real _columnSpacing:       ScreenTools.defaultFontPixelHeight * 0.25
+    property bool _uploadedSelected:    false
 
     QGCPalette { id: qgcPal }
 
     Connections {
         target: QGroundControl.mavlinkLogManager
         onSelectedCountChanged: {
+            _uploadedSelected = false
             var selected = 0
             for(var i = 0; i < QGroundControl.mavlinkLogManager.logFiles.count; i++) {
                 var logFile = QGroundControl.mavlinkLogManager.logFiles.get(i)
-                if(logFile.selected)
+                if(logFile.selected) {
                     selected++
+                    //-- If an uploaded file is selected, disable "Upload" button
+                    if(logFile.uploaded) {
+                        _uploadedSelected = true
+                    }
+                }
             }
             _selectedCount = selected
         }
@@ -425,7 +431,7 @@ Rectangle {
                         }
                         QGCButton {
                             text:       "Upload Selected"
-                            enabled:    _selectedCount > 0 && !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning
+                            enabled:    _selectedCount > 0 && !QGroundControl.mavlinkLogManager.uploading && !QGroundControl.mavlinkLogManager.logRunning && !_uploadedSelected
                             visible:    !QGroundControl.mavlinkLogManager.uploading
                             onClicked:  {
                                 QGroundControl.mavlinkLogManager.emailAddress = emailField.text