diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbineGas.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbineGas.java
index 0ce97569d..9f8155885 100644
--- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbineGas.java
+++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbineGas.java
@@ -278,6 +278,7 @@ public class TileEntityMachineTurbineGas extends TileEntityMachineBase implement
 		}
 
 		if(counter == 580) {
+			counter = 225; // ensures it shuts down properly when done immediately after startup
 			state = 1;
 		}
 	}
@@ -636,14 +637,14 @@ public class TileEntityMachineTurbineGas extends TileEntityMachineBase implement
 	@Callback(direct = true, limit = 4)
 	@Optional.Method(modid = "OpenComputers")
 	public Object[] start(Context context, Arguments args) {
-		state = -1;
+		if (state == 0) state = -1;
 		return new Object[] {};
 	}
 
 	@Callback(direct = true, limit = 4)
 	@Optional.Method(modid = "OpenComputers")
 	public Object[] stop(Context context, Arguments args) {
-		state = 0;
+		if (state == 1) state = 0;
 		return new Object[] {};
 	}