diff --git a/Modules/Mavlink/mavlinkmodule.cpp b/Modules/Mavlink/mavlinkmodule.cpp
index f49eb3ba0da8efe61b24a089fa7e1006e199ab25..2c65c846a1401ffb5bf95b11f2fb9a2adcf80d99 100644
--- a/Modules/Mavlink/mavlinkmodule.cpp
+++ b/Modules/Mavlink/mavlinkmodule.cpp
@@ -402,6 +402,9 @@ void MavlinkModule::onCommandReceived(const ModuleMessage &msg)
 //        }
 //    }
 
+    encoded_mvl_msg.sysid = validSysid;
+    encoded_mvl_msg.compid = validCompid;
+
     if(portOpen && portNumber >= 0){
         mavlinkCommandAdapter.send(encoded_mvl_msg);
     }
@@ -480,6 +483,9 @@ void MavlinkModule::onTelemetryRequestReceived(const ModuleMessage &msg)
 //        encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_STRAIN_BOARD_TM_ID);
 //    }
 
+    encoded_mvl_msg.sysid = validSysid;
+    encoded_mvl_msg.compid = validCompid;
+
     if(portOpen && portNumber >= 0){
         mavlinkCommandAdapter.send(encoded_mvl_msg);
     }
diff --git a/Modules/Mavlink/mavlinkreader.h b/Modules/Mavlink/mavlinkreader.h
index b768d1b17abc642423497396f7c834a9d0c423a5..c6e2116a75b1c19c540625b69e3af68b0c0a698c 100644
--- a/Modules/Mavlink/mavlinkreader.h
+++ b/Modules/Mavlink/mavlinkreader.h
@@ -66,9 +66,6 @@ private:
 
     QString logFilePath = "";
     QFile logFile;
-
-    uint8_t validSysid = 171;
-    uint8_t validCompid = 96;
 };
 
 #endif // MAVLINKREADER_H
diff --git a/Modules/Mavlink/mavlinkversionheader.h b/Modules/Mavlink/mavlinkversionheader.h
index f4b4d0cf83f9c448ad94f39adc5bfc0bc14a88cd..ecf5344ae5ddd99ec5c45d326bfbdb87b5bab701 100644
--- a/Modules/Mavlink/mavlinkversionheader.h
+++ b/Modules/Mavlink/mavlinkversionheader.h
@@ -4,5 +4,8 @@
 //#include "mavlink_skyward_lib/mavlink_lib/hermes/mavlink.h"
 #include "mavlink_skyward_lib/mavlink_lib/lynx/mavlink.h"
 
+static __attribute__((unused)) uint8_t validSysid = 171;
+static __attribute__((unused)) uint8_t validCompid = 96;
+
 
 #endif // MAVLINKVERSIONHEADER_H
diff --git a/SkywardHub.pro.user b/SkywardHub.pro.user
index 6899b2f226d1bf5cb8dedf05d03a06ae66794337..863e5eae4c27202956e98b918dc6051b67e20ac3 100644
--- a/SkywardHub.pro.user
+++ b/SkywardHub.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.14.2, 2021-09-29T20:55:13. -->
+<!-- Written by QtCreator 4.14.2, 2021-10-01T22:10:38. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>