diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc
index af3a5a11f8763e5ec1e964fc9b4b274869411f11..076217e3b6adc7f56ceb5384bc22371f08365e66 100644
--- a/src/Vehicle/Vehicle.cc
+++ b/src/Vehicle/Vehicle.cc
@@ -449,6 +449,11 @@ bool Vehicle::sendMessageOnLink(LinkInterface* link, mavlink_message_t message)
 
 void Vehicle::_sendMessageOnLink(LinkInterface* link, mavlink_message_t message)
 {
+    // Make sure this is still a good link
+    if (!link || !_links.contains(link) || !link->isConnected()) {
+        return;
+    }
+
     // Give the plugin a chance to adjust
     _firmwarePlugin->adjustMavlinkMessage(this, &message);