diff --git a/src/ui/HDDisplay.cc b/src/ui/HDDisplay.cc
index 6580c651eca9fa55e705ef919021c1a13553f8cf..6a513b62bafb29c13345090c03252b8619d7ec52 100644
--- a/src/ui/HDDisplay.cc
+++ b/src/ui/HDDisplay.cc
@@ -473,16 +473,17 @@ void HDDisplay::renderOverlay()
  */
 void HDDisplay::setActiveUAS(UASInterface* uas)
 {
-    if (!uas)
-        return;
     // Disconnect any previously connected active UAS
     if (this->uas != NULL) {
         removeSource(this->uas);
+        this->uas = NULL;
     }
 
-    // Now connect the new UAS
-	addSource(uas);
-    this->uas = uas;
+    if (uas) {
+        // Now connect the new UAS
+        addSource(uas);
+        this->uas = uas;
+    }
 }
 
 /**