diff --git a/src/comm/MockLink.cc b/src/comm/MockLink.cc
index dd8e708b2d5c38e743c20225795c4a536510f771..220d2db0bbba5d4afaae59844b70bd7d96a7eebe 100644
--- a/src/comm/MockLink.cc
+++ b/src/comm/MockLink.cc
@@ -88,6 +88,7 @@ MockLink::MockLink(MockConfiguration* config)
     , _fileServer(NULL)
     , _sendStatusText(false)
     , _apmSendHomePositionOnEmptyList(false)
+    , _sendHomePositionDelayCount(2)
 {
     _config = config;
     if (_config) {
@@ -171,7 +172,12 @@ void MockLink::_run1HzTasks(void)
 {
     if (_mavlinkStarted && _connected) {
         _sendHeartBeat();
-        _sendHomePosition();
+        if (_sendHomePositionDelayCount > 0) {
+            // We delay home position a bit to be more realistic
+            _sendHomePositionDelayCount--;
+        } else {
+            _sendHomePosition();
+        }
         if (_sendStatusText) {
             _sendStatusText = false;
             _sendStatusTextMessages();
@@ -715,24 +721,29 @@ void MockLink::setMissionItemFailureMode(MockLinkMissionItemHandler::FailureMode
 
 void MockLink::_sendHomePosition(void)
 {
-    mavlink_message_t msg;
-    
-    float bogus[4];
-    bogus[0] = 0.0f;
-    bogus[1] = 0.0f;
-    bogus[2] = 0.0f;
-    bogus[3] = 0.0f;
-   
-    mavlink_msg_home_position_pack(_vehicleSystemId,
-                                   _vehicleComponentId,
-                                   &msg,
-                                   (int32_t)(_vehicleLatitude * 1E7),
-                                   (int32_t)(_vehicleLongitude * 1E7),
-                                   (int32_t)(_vehicleAltitude * 1000),
-                                   0.0f, 0.0f, 0.0f,
-                                   &bogus[0],
-                                   0.0f, 0.0f, 0.0f);
-    respondWithMavlinkMessage(msg);
+    // APM stack does not yet support HOME_POSITION
+
+    if (_firmwareType != MAV_AUTOPILOT_ARDUPILOTMEGA) {
+
+        mavlink_message_t msg;
+
+        float bogus[4];
+        bogus[0] = 0.0f;
+        bogus[1] = 0.0f;
+        bogus[2] = 0.0f;
+        bogus[3] = 0.0f;
+
+        mavlink_msg_home_position_pack(_vehicleSystemId,
+                                       _vehicleComponentId,
+                                       &msg,
+                                       (int32_t)(_vehicleLatitude * 1E7),
+                                       (int32_t)(_vehicleLongitude * 1E7),
+                                       (int32_t)(_vehicleAltitude * 1000),
+                                       0.0f, 0.0f, 0.0f,
+                                       &bogus[0],
+                0.0f, 0.0f, 0.0f);
+        respondWithMavlinkMessage(msg);
+    }
 }
 
 void MockLink::_sendGpsRawInt(void)
diff --git a/src/comm/MockLink.h b/src/comm/MockLink.h
index ae043f92eeac4483b9cbc3448fb9124a03ebbe66..a78bbd238f10787d2a77a14acbbbaa4a92cd4d40 100644
--- a/src/comm/MockLink.h
+++ b/src/comm/MockLink.h
@@ -191,6 +191,8 @@ private:
     bool _sendStatusText;
     bool _apmSendHomePositionOnEmptyList;
 
+    int _sendHomePositionDelayCount;
+
     static float _vehicleLatitude;
     static float _vehicleLongitude;
     static float _vehicleAltitude;