diff --git a/src/ui/uas/UASView.cc b/src/ui/uas/UASView.cc
index 507272ec7c8f629e36e8e1ce0f6bfc596124fdc3..875229193c5e3ec7fbb25fd0ae5a28321a61b235 100644
--- a/src/ui/uas/UASView.cc
+++ b/src/ui/uas/UASView.cc
@@ -483,10 +483,14 @@ void UASView::contextMenuEvent (QContextMenuEvent* event)
     menu.addAction(selectAction);
     menu.addSeparator();
     menu.addAction(renameAction);
+/*
+    FIXME: The code below is incorrect. removeAction should only be available when link is
+            disconnected. fSee Issue #1275
     if (timeout)
     {
         menu.addAction(removeAction);
     }
+*/
     menu.addAction(hilAction);
     menu.addAction(selectAirframeAction);
     menu.addAction(setBatterySpecsAction);