diff --git a/cura/Machines/Models/BaseMaterialsModel.py b/cura/Machines/Models/BaseMaterialsModel.py
index 0a1337feeb..4759c8b5b0 100644
--- a/cura/Machines/Models/BaseMaterialsModel.py
+++ b/cura/Machines/Models/BaseMaterialsModel.py
@@ -39,6 +39,8 @@ class BaseMaterialsModel(ListModel):
 
         self._extruder_position = 0
         self._extruder_stack = None
+        # Update the stack and the model data when the machine changes
+        self._machine_manager.globalContainerChanged.connect(self._updateExtruderStack)
 
     def _updateExtruderStack(self):
         global_stack = self._machine_manager.activeMachine
@@ -50,9 +52,11 @@ class BaseMaterialsModel(ListModel):
         self._extruder_stack = global_stack.extruders.get(str(self._extruder_position))
         if self._extruder_stack is not None:
             self._extruder_stack.pyqtContainersChanged.connect(self._update)
+        # Force update the model when the extruder stack changes
+        self._update()
 
     def setExtruderPosition(self, position: int):
-        if self._extruder_position != position:
+        if self._extruder_stack is None or self._extruder_position != position:
             self._extruder_position = position
             self._updateExtruderStack()
             self.extruderPositionChanged.emit()
diff --git a/resources/qml/Menus/MaterialMenu.qml b/resources/qml/Menus/MaterialMenu.qml
index d81e0c86c3..64b3130724 100644
--- a/resources/qml/Menus/MaterialMenu.qml
+++ b/resources/qml/Menus/MaterialMenu.qml
@@ -63,8 +63,7 @@ Menu
                             exclusiveGroup: group
                             onTriggered:
                             {
-                                var activeExtruderIndex = Cura.ExtruderManager.activeExtruderIndex;
-                                Cura.MachineManager.setMaterial(activeExtruderIndex, model.container_node);
+                                Cura.MachineManager.setMaterial(extruderIndex, model.container_node);
                             }
                         }
                         onObjectAdded: brandMaterialsMenu.insertItem(index, object)