diff --git a/DiscoverUM3Action.py b/DiscoverUM3Action.py
index 3d69a8c118..8213812391 100644
--- a/DiscoverUM3Action.py
+++ b/DiscoverUM3Action.py
@@ -75,7 +75,10 @@ class DiscoverUM3Action(MachineAction):
     @pyqtProperty("QVariantList", notify = printersChanged)
     def foundDevices(self):
         if self._network_plugin:
+            global_printer_type = Application.getInstance().getGlobalContainerStack().getBottom().getId()
             printers = list(self._network_plugin.getPrinters().values())
+            # TODO; There are still some testing printers that don't have a correct printer type, so don't filter out unkown ones just yet.
+            printers = [printer for printer in printers if printer.printerType == global_printer_type or printer.printerType == "unknown"]
             printers.sort(key = lambda k: k.name)
             return printers
         else:
diff --git a/NetworkPrinterOutputDevice.py b/NetworkPrinterOutputDevice.py
index f57637af1f..3d56a777aa 100644
--- a/NetworkPrinterOutputDevice.py
+++ b/NetworkPrinterOutputDevice.py
@@ -168,9 +168,9 @@ class NetworkPrinterOutputDevice(PrinterOutputDevice):
 
         printer_type = self._properties.get(b"machine", b"").decode("utf-8")
         if printer_type == "9511.0":
-            self._updatePrinterType("UM3Extended")
+            self._updatePrinterType("ultimaker3_extended")
         elif printer_type == "9066.0":
-            self._updatePrinterType("UM3")
+            self._updatePrinterType("ultimaker3")
         else:
             self._updatePrinterType("unknown")