diff --git a/cura/Settings/CuraStackBuilder.py b/cura/Settings/CuraStackBuilder.py
index 95aa364a2e..c98c63f529 100644
--- a/cura/Settings/CuraStackBuilder.py
+++ b/cura/Settings/CuraStackBuilder.py
@@ -145,7 +145,6 @@ class CuraStackBuilder:
             quality_container = application.empty_quality_container
         )
         new_extruder.setNextStack(global_stack)
-        global_stack.addExtruder(new_extruder)
 
         registry.addContainer(new_extruder)
 
diff --git a/cura/Settings/ExtruderManager.py b/cura/Settings/ExtruderManager.py
index 2514e17075..4c2e301c57 100755
--- a/cura/Settings/ExtruderManager.py
+++ b/cura/Settings/ExtruderManager.py
@@ -367,6 +367,7 @@ class ExtruderManager(QObject):
             # Single extrusion machine without an ExtruderStack, create it
             from cura.Settings.CuraStackBuilder import CuraStackBuilder
             CuraStackBuilder.createExtruderStackWithDefaultSetup(global_stack, 0)
+            extruder_stack_0.setNextStack(global_stack)
 
         elif extruder_stack_0.definition.getId() != expected_extruder_definition_0_id:
             Logger.log("e", "Single extruder printer [{printer}] expected extruder [{expected}], but got [{got}]. I'm making it [{expected}].".format(
@@ -374,8 +375,6 @@ class ExtruderManager(QObject):
             extruder_definition = container_registry.findDefinitionContainers(id = expected_extruder_definition_0_id)[0]
             extruder_stack_0.definition = extruder_definition
 
-        extruder_stack_0.setNextStack(global_stack)
-
     ##  Get all extruder values for a certain setting.
     #
     #   This is exposed to qml for display purposes