diff --git a/src/FffGcodeWriter.cpp b/src/FffGcodeWriter.cpp
index 1e422699f2..c2f48297ce 100644
--- a/src/FffGcodeWriter.cpp
+++ b/src/FffGcodeWriter.cpp
@@ -1100,7 +1100,7 @@ void FffGcodeWriter::endRaftLayer(const SliceDataStorage& storage, LayerPlan& gc
     setExtruder_addPrime(storage, gcode_layer, current_extruder, append_to_prime_tower);
 
     // If required, fill prime tower for other extruders
-    for (const ExtruderUse& extruder_use : getExtruderUse(layer_nr))
+    for (const ExtruderUse& extruder_use : extruder_order_per_layer.get(layer_nr))
     {
         if (! append_to_prime_tower || (! gcode_layer.getPrimeTowerIsPlanned(extruder_use.extruder_nr) && extruder_use.prime != ExtruderPrime::None))
         {