diff --git a/cura/Machines/Models/GenericMaterialsModel.py b/cura/Machines/Models/GenericMaterialsModel.py
index 335e5ef6e8..e6fd1aa545 100644
--- a/cura/Machines/Models/GenericMaterialsModel.py
+++ b/cura/Machines/Models/GenericMaterialsModel.py
@@ -40,12 +40,14 @@ class GenericMaterialsModel(BaseMaterialsModel):
             self.setItems([])
             return
 
-        # Check if it's an Ultimaker printer
-        printer_manufacturer = global_stack.getMetaDataEntry("manufacturer", "")
-        is_ultimaker_printer = "ultimaker" in printer_manufacturer.lower()
+        #special case only for Ultimaker printers, filter the generic list
+        printer_name = global_stack.getMetaDataEntry("name", "empty")
+        filter_ultimaker_printers = False
+        if printer_name and printer_name[:9] == "Ultimaker":
+            filter_ultimaker_printers = True
 
-        # For Ultimaker printers, only show the generic materials that are supported.
-        if not is_ultimaker_printer:
+        # Special case, Ultimaker generic list also should be filtered
+        if filter_ultimaker_printers is False:
             item_list = self._getGenericProfiles(available_material_dict)
         else:
             item_list = self._getUltimakerGenericProfiles(available_material_dict)