diff --git a/src/comm/QGCFlightGearLink.cc b/src/comm/QGCFlightGearLink.cc
index 6e34c738d8e68094f22df9692c09a84d194d0ff5..279e66582747c951ee9ae9010de58959867873db 100644
--- a/src/comm/QGCFlightGearLink.cc
+++ b/src/comm/QGCFlightGearLink.cc
@@ -536,6 +536,15 @@ void QGCFlightGearLink::printTerraSyncError()
    }
 }
 
+/**
+ * @brief Set the startup arguments used to start flightgear
+ *
+ **/
+void QGCFlightGearLink::setStartupArguments(QString startupArguments)
+{
+    this->startupArguments = startupArguments;
+}
+
 /**
  * @brief Check if connection is active.
  *
diff --git a/src/comm/QGCFlightGearLink.h b/src/comm/QGCFlightGearLink.h
index 8f1f64ba912fb15049fcd7c1c1fe6315c71eccc6..f8cbb2628c99fa2be99e3f99d242d7836544679f 100644
--- a/src/comm/QGCFlightGearLink.h
+++ b/src/comm/QGCFlightGearLink.h
@@ -117,6 +117,7 @@ public slots:
 
     void printTerraSyncOutput();
     void printTerraSyncError();
+    void setStartupArguments(QString startupArguments);
 
 protected:
     QString name;
diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index f21f57f2ea0e8e067b573fa8d74314aa6b50eeb6..99e305e68a51ebd41bf6bcf011660ce8c0245528 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -2602,6 +2602,8 @@ void UAS::enableHilFlightGear(bool enable, QString options)
         simulation = new QGCFlightGearLink(this, options);
     }
     // Connect Flight Gear Link
+    link = dynamic_cast<QGCFlightGearLink*>(simulation);
+    link->setStartupArguments(options);
     if (enable)
     {
         startHil();