diff --git a/resources/qml/Menus/LocalPrinterMenu.qml b/resources/qml/Menus/LocalPrinterMenu.qml
index 0bdd4f33b9..e7c5037814 100644
--- a/resources/qml/Menus/LocalPrinterMenu.qml
+++ b/resources/qml/Menus/LocalPrinterMenu.qml
@@ -7,16 +7,18 @@ import QtQuick.Controls 1.4
 import UM 1.2 as UM
 import Cura 1.0 as Cura
 
-Instantiator {
-    model: UM.ContainerStacksModel {
-        filter: {"type": "machine", "um_network_key": null}
-    }
-    MenuItem {
-        text: model.name;
-        checkable: true;
+Instantiator
+{
+    model: Cura.PrintersModel {}
+
+    MenuItem
+    {
+        text: model.name
+        checkable: true
         checked: Cura.MachineManager.activeMachineId == model.id
-        exclusiveGroup: group;
-        onTriggered: Cura.MachineManager.setActiveMachine(model.id);
+        exclusiveGroup: group
+        visible: !model.hasRemoteConnection
+        onTriggered: Cura.MachineManager.setActiveMachine(model.id)
     }
     onObjectAdded: menu.insertItem(index, object)
     onObjectRemoved: menu.removeItem(object)
diff --git a/resources/qml/Menus/NetworkPrinterMenu.qml b/resources/qml/Menus/NetworkPrinterMenu.qml
index 166e45f3b9..8c607bc5ae 100644
--- a/resources/qml/Menus/NetworkPrinterMenu.qml
+++ b/resources/qml/Menus/NetworkPrinterMenu.qml
@@ -9,19 +9,15 @@ import Cura 1.0 as Cura
 
 Instantiator
 {
-    model: UM.ContainerStacksModel
-    {
-        filter: {"type": "machine", "um_network_key": "*", "hidden": "False"}
-    }
+    model: Cura.PrintersModel {}
     MenuItem
     {
-        // TODO: Use printer_group icon when it's a cluster. Not use it for now since it doesn't look as expected
-//        iconSource: UM.Theme.getIcon("printer_single")
         text: model.metadata["connect_group_name"]
-        checkable: true;
+        checkable: true
+        visible: model.hasRemoteConnection
         checked: Cura.MachineManager.activeMachineNetworkGroupName == model.metadata["connect_group_name"]
-        exclusiveGroup: group;
-        onTriggered: Cura.MachineManager.setActiveMachine(model.id);
+        exclusiveGroup: group
+        onTriggered: Cura.MachineManager.setActiveMachine(model.id)
     }
     onObjectAdded: menu.insertItem(index, object)
     onObjectRemoved: menu.removeItem(object)