diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml
index 2d9a7eba2d..8dcf1e8454 100644
--- a/plugins/3MFReader/WorkspaceDialog.qml
+++ b/plugins/3MFReader/WorkspaceDialog.qml
@@ -116,6 +116,7 @@ UM.Dialog
                         isCloudRegistered: false
                         isNetworkPrinter: manager.isNetworked
                         isGroup: manager.isAbstractMachine
+                        connectionStatus: ""
 
                         minDropDownWidth: machineSelector.width
 
diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml
index b8bacc8f36..b8b27049f6 100644
--- a/resources/qml/PrinterSelector/MachineSelector.qml
+++ b/resources/qml/PrinterSelector/MachineSelector.qml
@@ -33,7 +33,7 @@ Cura.ExpandablePopup
 
     property list<Item> buttons
 
-    readonly property string connectionStatus: {
+    property string connectionStatus: {
         if (isNetworkPrinter)
         {
             return "printer_connected"
@@ -148,7 +148,7 @@ Cura.ExpandablePopup
 
             color: connectionStatus == "printer_cloud_not_available" ? UM.Theme.getColor("cloud_unavailable") : UM.Theme.getColor("primary")
 
-            visible: isNetworkPrinter || isCloudRegistered
+            visible: (isNetworkPrinter || isCloudRegistered) && source != ""
 
             // Make a themable circle in the background so we can change it in other themes
             Rectangle