diff --git a/cura/Settings/CuraContainerRegistry.py b/cura/Settings/CuraContainerRegistry.py
index d69a97c92f..0c0386ade1 100644
--- a/cura/Settings/CuraContainerRegistry.py
+++ b/cura/Settings/CuraContainerRegistry.py
@@ -406,45 +406,48 @@ class CuraContainerRegistry(ContainerRegistry):
 
     def _addExtruderStackForSingleExtrusionMachine(self, machine, extruder_id):
         new_extruder_id = extruder_id
+        extruder_stack = None
 
         # if extruders are defined in the machine definition use those instead
         if machine.extruders and len(machine.extruders) > 0:
             new_extruder_id = machine.extruders["0"].getId()
+            extruder_stack = machine.extruders["0"]
 
-        extruder_definitions = self.findDefinitionContainers(id = new_extruder_id)
+        # if the extruder stack doesn't exist yet we create and add it
+        if not extruder_stack:
+            extruder_definitions = self.findDefinitionContainers(id = new_extruder_id)
+            if not extruder_definitions:
+                Logger.log("w", "Could not find definition containers for extruder %s", new_extruder_id)
+                return
 
-        if not extruder_definitions:
-            Logger.log("w", "Could not find definition containers for extruder %s", new_extruder_id)
-            return
+            extruder_definition = extruder_definitions[0]
+            unique_name = self.uniqueName(machine.getName() + " " + new_extruder_id)
 
-        extruder_definition = extruder_definitions[0]
-        unique_name = self.uniqueName(machine.getName() + " " + new_extruder_id)
+            extruder_stack = ExtruderStack.ExtruderStack(unique_name)
+            extruder_stack.setName(extruder_definition.getName())
+            extruder_stack.setDefinition(extruder_definition)
+            extruder_stack.addMetaDataEntry("position", extruder_definition.getMetaDataEntry("position"))
+            extruder_stack.setNextStack(machine)
 
-        extruder_stack = ExtruderStack.ExtruderStack(unique_name)
-        extruder_stack.setName(extruder_definition.getName())
-        extruder_stack.setDefinition(extruder_definition)
-        extruder_stack.addMetaDataEntry("position", extruder_definition.getMetaDataEntry("position"))
-        extruder_stack.setNextStack(machine)
+            if machine.userChanges:
+                # set existing user changes if found
+                extruder_stack.setUserChanges(machine.userChanges)
+            else:
+                # create empty user changes container otherwise
+                user_container = InstanceContainer(extruder_stack.id + "_user")
+                user_container.addMetaDataEntry("type", "user")
+                user_container.addMetaDataEntry("machine", extruder_stack.getId())
+                from cura.CuraApplication import CuraApplication
+                user_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
+                user_container.setDefinition(extruder_definition)
+                extruder_stack.setUserChanges(user_container)
+                self.addContainer(user_container)
 
-        if machine.userChanges:
-            # set existing user changes if found
-            extruder_stack.setUserChanges(machine.userChanges)
-        else:
-            # create empty user changes container otherwise
-            user_container = InstanceContainer(extruder_stack.id + "_user")
-            user_container.addMetaDataEntry("type", "user")
-            user_container.addMetaDataEntry("machine", extruder_stack.getId())
-            from cura.CuraApplication import CuraApplication
-            user_container.addMetaDataEntry("setting_version", CuraApplication.SettingVersion)
-            user_container.setDefinition(extruder_definition)
-            extruder_stack.setUserChanges(user_container)
-            self.addContainer(user_container)
+            extruder_stack.setVariantById("default")
+            extruder_stack.setMaterialById("default")
+            extruder_stack.setQualityById("default")
 
-        extruder_stack.setVariantById("default")
-        extruder_stack.setMaterialById("default")
-        extruder_stack.setQualityById("default")
-
-        self.addContainer(extruder_stack)
+            self.addContainer(extruder_stack)
 
     # Fix the extruders that were upgraded to ExtruderStack instances during addContainer.
     # The stacks are now responsible for setting the next stack on deserialize. However,