diff --git a/src/QGCFileDownload.cc b/src/QGCFileDownload.cc
index 9a262ff0905865e8c9ec02a837122e800b3d2d50..43f3512f73f9f6bd65375fd20f6c7eb902a0f58f 100644
--- a/src/QGCFileDownload.cc
+++ b/src/QGCFileDownload.cc
@@ -33,6 +33,12 @@ bool QGCFileDownload::download(const QString& remoteFile)
         return false;
     }
 
+    // Strip out parameters from remote filename
+    int parameterIndex = remoteFileName.indexOf("?");
+    if (parameterIndex != -1) {
+        remoteFileName  = remoteFileName.left(parameterIndex);
+    }
+
     // Determine location to download file to
     QString localFile = QStandardPaths::writableLocation(QStandardPaths::TempLocation);
     if (localFile.isEmpty()) {