diff --git a/cura/Machines/Models/QualityManagementModel.py b/cura/Machines/Models/QualityManagementModel.py
index 4d2b551805..a0310bc229 100644
--- a/cura/Machines/Models/QualityManagementModel.py
+++ b/cura/Machines/Models/QualityManagementModel.py
@@ -66,9 +66,7 @@ class QualityManagementModel(ListModel):
         # Create quality_changes group items
         quality_changes_item_list = []
         for quality_changes_group in quality_changes_group_dict.values():
-            if quality_changes_group.quality_type not in available_quality_types:
-                continue
-            quality_group = quality_group_dict[quality_changes_group.quality_type]
+            quality_group = quality_group_dict.get(quality_changes_group.quality_type)
             item = {"name": quality_changes_group.name,
                     "is_read_only": False,
                     "quality_group": quality_group,
diff --git a/cura/Machines/Models/QualitySettingsModel.py b/cura/Machines/Models/QualitySettingsModel.py
index b38f6f65c8..0f7901b3d0 100644
--- a/cura/Machines/Models/QualitySettingsModel.py
+++ b/cura/Machines/Models/QualitySettingsModel.py
@@ -84,11 +84,14 @@ class QualitySettingsModel(ListModel):
         quality_group = self._selected_quality_item["quality_group"]
         quality_changes_group = self._selected_quality_item["quality_changes_group"]
 
-        if self._selected_position == self.GLOBAL_STACK_POSITION:
-            quality_node = quality_group.node_for_global
-        else:
-            quality_node = quality_group.nodes_for_extruders.get(str(self._selected_position))
-        settings_keys = quality_group.getAllKeys()
+        quality_node = None
+        settings_keys = set()
+        if quality_group:
+            if self._selected_position == self.GLOBAL_STACK_POSITION:
+                quality_node = quality_group.node_for_global
+            else:
+                quality_node = quality_group.nodes_for_extruders.get(str(self._selected_position))
+            settings_keys = quality_group.getAllKeys()
         quality_containers = []
         if quality_node is not None:
             quality_containers.append(quality_node.getContainer())