diff --git a/plugins/MonitorStage/MonitorMain.qml b/plugins/MonitorStage/MonitorMain.qml
index a73650ed6a..ae7923656b 100644
--- a/plugins/MonitorStage/MonitorMain.qml
+++ b/plugins/MonitorStage/MonitorMain.qml
@@ -11,7 +11,7 @@ Rectangle
 {
     id: viewportOverlay
 
-    property bool isConnected: Cura.MachineManager.activeMachineHasActiveNetworkConnection || Cura.MachineManager.activeMachineHasActiveCloudConnection
+    property bool isConnected: Cura.MachineManager.activeMachineIsUsingCloudConnection
     property bool isNetworkConfigurable: ["Ultimaker 3", "Ultimaker 3 Extended", "Ultimaker S5"].indexOf(Cura.MachineManager.activeMachineDefinitionName) > -1
     property bool isNetworkConfigured:
     {
diff --git a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
index 5d824ada97..6eaff20f71 100644
--- a/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
+++ b/plugins/UM3NetworkPrinting/resources/qml/MonitorQueue.qml
@@ -171,11 +171,11 @@ Item
                 // When printing over the cloud we don't recieve print jobs until there is one, so
                 // unless there's at least one print job we'll be stuck with skeleton loading
                 // indefinitely.
-                if (Cura.MachineManager.activeMachineHasActiveCloudConnection)
+                if (Cura.MachineManager.activeMachineIsUsingCloudConnection || OutputDevice.receivedPrintJobs)
                 {
                     return OutputDevice.queuedPrintJobs
                 }
-                return OutputDevice.receivedPrintJobs ? OutputDevice.queuedPrintJobs : [null,null]
+                return [null, null]
             }
             spacing: 6  // TODO: Theme!
         }