diff --git a/src/ui/preferences/RemoteIDSettings.qml b/src/ui/preferences/RemoteIDSettings.qml
index 79ec86d07cd..11f723f1410 100644
--- a/src/ui/preferences/RemoteIDSettings.qml
+++ b/src/ui/preferences/RemoteIDSettings.qml
@@ -42,6 +42,9 @@ Rectangle {
     // Flag to get active vehicle and active RID
     property var  _activeRID:           _activeVehicle && _activeVehicle.remoteIDManager ? _activeVehicle.remoteIDManager : null
 
+    // Healthy connection with RID device
+    property bool commsGood:            _activeVehicle && _activeVehicle.remoteIDManager ? _activeVehicle.remoteIDManager.commsGood : false
+
     // General properties
     property var  _activeVehicle:       QGroundControl.multiVehicleManager.activeVehicle
     property int  _regionOperation:     QGroundControl.settingsManager.remoteIDSettings.region.value
@@ -151,6 +154,7 @@ Rectangle {
                         Layout.preferredWidth:  flagsWidth
                         color:                  _activeRID ? (_activeVehicle.remoteIDManager.armStatusGood ? qgcPal.colorGreen : qgcPal.colorRed) : qgcPal.colorGrey
                         radius:                 radiusFlags
+                        visible:                commsGood
 
                         QGCLabel {
                             anchors.fill:           parent
@@ -178,7 +182,7 @@ Rectangle {
 
                         QGCLabel {
                             anchors.fill:           parent
-                            text:                   qsTr("RID COMMS")
+                            text:                   _activeRID && _activeVehicle.remoteIDManager.commsGood ? qsTr("RID COMMS") : qsTr("NOT CONNECTED")
                             wrapMode:               Text.WordWrap
                             horizontalAlignment:    Text.AlignHCenter
                             verticalAlignment:      Text.AlignVCenter
@@ -192,6 +196,7 @@ Rectangle {
                         Layout.preferredWidth:  flagsWidth
                         color:                  _activeRID ? (_activeVehicle.remoteIDManager.gcsGPSGood ? qgcPal.colorGreen : qgcPal.colorRed) : qgcPal.colorGrey
                         radius:                 radiusFlags
+                        visible:                commsGood
 
                         QGCLabel {
                             anchors.fill:           parent
@@ -215,6 +220,7 @@ Rectangle {
                         Layout.preferredWidth:  flagsWidth
                         color:                  _activeRID ? (_activeVehicle.remoteIDManager.basicIDGood ? qgcPal.colorGreen : qgcPal.colorRed) : qgcPal.colorGrey
                         radius:                 radiusFlags
+                        visible:                commsGood
 
                         QGCLabel {
                             anchors.fill:           parent
@@ -238,7 +244,7 @@ Rectangle {
                         Layout.preferredWidth:  flagsWidth
                         color:                  _activeRID ? (_activeVehicle.remoteIDManager.operatorIDGood ? qgcPal.colorGreen : qgcPal.colorRed) : qgcPal.colorGrey
                         radius:                 radiusFlags
-                        visible:                _activeRID ? (QGroundControl.settingsManager.remoteIDSettings.sendOperatorID.value || _regionOperation == RemoteIDSettings.RegionOperation.EU) : false
+                        visible:                commsGood && _activeRID ? (QGroundControl.settingsManager.remoteIDSettings.sendOperatorID.value || _regionOperation == RemoteIDSettings.RegionOperation.EU) : false
 
                         QGCLabel {
                             anchors.fill:           parent
diff --git a/src/ui/toolbar/RemoteIDIndicator.qml b/src/ui/toolbar/RemoteIDIndicator.qml
index b3d4a54dba8..26e29f647eb 100644
--- a/src/ui/toolbar/RemoteIDIndicator.qml
+++ b/src/ui/toolbar/RemoteIDIndicator.qml
@@ -142,6 +142,7 @@ Item {
                         source:             armFlag ? "/qmlimages/RidFlagBackgroundGreen.svg" : "/qmlimages/RidFlagBackgroundRed.svg"
                         fillMode:           Image.PreserveAspectFit
                         sourceSize.height:  height
+                        visible:            commsFlag
 
                         QGCLabel {
                             anchors.fill:           parent
@@ -169,7 +170,7 @@ Item {
 
                         QGCLabel {
                             anchors.fill:           parent
-                            text:                   qsTr("RID COMMS")
+                            text:                   commsFlag ? qsTr("RID COMMS") : qsTr("NOT CONNECTED")
                             wrapMode:               Text.WordWrap
                             horizontalAlignment:    Text.AlignHCenter
                             verticalAlignment:      Text.AlignVCenter
@@ -190,6 +191,7 @@ Item {
                         source:             gpsFlag ? "/qmlimages/RidFlagBackgroundGreen.svg" : "/qmlimages/RidFlagBackgroundRed.svg"
                         fillMode:           Image.PreserveAspectFit
                         sourceSize.height:  height
+                        visible:            commsFlag
 
                         QGCLabel {
                             anchors.fill:           parent
@@ -214,6 +216,7 @@ Item {
                         source:             basicIDFlag ? "/qmlimages/RidFlagBackgroundGreen.svg" : "/qmlimages/RidFlagBackgroundRed.svg"
                         fillMode:           Image.PreserveAspectFit
                         sourceSize.height:  height
+                        visible:            commsFlag
 
                         QGCLabel {
                             anchors.fill:           parent
@@ -238,7 +241,7 @@ Item {
                         source:             operatorIDFlag ? "/qmlimages/RidFlagBackgroundGreen.svg" : "/qmlimages/RidFlagBackgroundRed.svg"
                         fillMode:           Image.PreserveAspectFit
                         sourceSize.height:  height
-                        visible:            _activeVehicle ? (QGroundControl.settingsManager.remoteIDSettings.sendOperatorID.value || _regionOperation == RemoteIDIndicator.RegionOperation.EU) : false
+                        visible:            commsFlag && _activeVehicle ? (QGroundControl.settingsManager.remoteIDSettings.sendOperatorID.value || _regionOperation == RemoteIDIndicator.RegionOperation.EU) : false
 
                         QGCLabel {
                             anchors.fill:           parent