diff --git a/resources/qml/Preferences/ProfileTab.qml b/resources/qml/Preferences/ProfileTab.qml
index 1be1d82cb8..7b1f99ebca 100644
--- a/resources/qml/Preferences/ProfileTab.qml
+++ b/resources/qml/Preferences/ProfileTab.qml
@@ -28,6 +28,11 @@ Tab
         section.property: "category"
         section.delegate: Label { text: section }
 
-        model: Cura.QualitySettingsModel { extruderId: base.extruderId != "" ? base.extruderId : null; quality: base.quality; material: base.material }
+        model: Cura.QualitySettingsModel
+        {
+            extruderId: base.extruderId != "" ? base.extruderId : null;
+            quality: base.quality != null ? base.quality : "";
+            material: base.material
+        }
     }
 }
diff --git a/resources/qml/Preferences/ProfilesPage.qml b/resources/qml/Preferences/ProfilesPage.qml
index 1454f558af..ea129a62b0 100644
--- a/resources/qml/Preferences/ProfilesPage.qml
+++ b/resources/qml/Preferences/ProfilesPage.qml
@@ -175,7 +175,7 @@ UM.ManagementPage
 
             Label {
                 id: defaultsMessage
-                visible: currentItem && !currentItem.metadata.has_settings
+                visible: false
                 text: catalog.i18nc("@action:label", "This profile has no settings and uses the defaults specified by the printer.")
                 wrapMode: Text.WordWrap
                 width: parent.width
@@ -197,13 +197,24 @@ UM.ManagementPage
             anchors.right: parent.right
             anchors.bottom: parent.bottom
 
-            ProfileTab { title: catalog.i18nc("@title:tab", "Global Settings"); quality: base.currentItem != null ? base.currentItem.id : ""; material: Cura.MachineManager.allActiveMaterialIds.global }
+            ProfileTab
+            {
+                title: catalog.i18nc("@title:tab", "Global Settings");
+                quality: base.currentItem != null ? base.currentItem.id : "";
+                material: Cura.MachineManager.allActiveMaterialIds.global
+            }
 
             Repeater
             {
                 model: Cura.ExtrudersModel { }
 
-                ProfileTab { title: model.name; extruderId: model.id; quality: base.currentItem.id; material: Cura.MachineManager.allActiveMaterialIds[model.id] }
+                ProfileTab
+                {
+                    title: model.name;
+                    extruderId: model.id;
+                    quality: base.currentItem != null ? base.currentItem.id : null;
+                    material: Cura.MachineManager.allActiveMaterialIds[model.id]
+                }
             }
         }
     }