diff --git a/src/main/java/celtech/roboxremote/rootDataStructures/StatusData.java b/src/main/java/celtech/roboxremote/rootDataStructures/StatusData.java
index a9543fa..1d6a6fd 100644
--- a/src/main/java/celtech/roboxremote/rootDataStructures/StatusData.java
+++ b/src/main/java/celtech/roboxremote/rootDataStructures/StatusData.java
@@ -25,7 +25,7 @@
 public class StatusData
 {
     private static final double HEATING_THREASHOLD = 5;
-    private static final double EJECT_TEMPERATURE = 140.0;
+    private static final double EJECT_TEMPERATURE_DELTA = 20.0;
 
     private String printerID;
     private String printerName;
@@ -362,7 +362,7 @@ private boolean updateHeaterStatus(NozzleHeater heater, String statusString)
                     break;
                     
                 case FILAMENT_EJECT:
-                    targetTemperature = EJECT_TEMPERATURE;
+                    targetTemperature = heater.nozzleTargetTemperatureProperty().get() - EJECT_TEMPERATURE_DELTA;
                     break;
 
                 case NORMAL: