diff --git a/src/main/java/net/minecraft/server/ConsoleCommandHandler.java b/src/main/java/net/minecraft/server/ConsoleCommandHandler.java
index 96b3c2d8e9..eb48f2d9be 100644
--- a/src/main/java/net/minecraft/server/ConsoleCommandHandler.java
+++ b/src/main/java/net/minecraft/server/ConsoleCommandHandler.java
@@ -30,9 +30,10 @@ public class ConsoleCommandHandler {
                 this.server.a();
             } else if (s.toLowerCase().startsWith("save-all")) {
                 this.print(s1, "Forcing save..");
+                boolean save = worldserver.y; // CraftBukkit - record current save flag state.
                 worldserver.y = false; // CraftBukkit - If save-all is used, we can assume saving should be turned on to allow for saving.
                 this.server.saveChunks(); // CraftBukkit - We should save all worlds on save-all.
-                worldserver.y = true; // CraftBukkit - Once done saving, we should turn it back off to avoid confusion.
+                worldserver.y = save;  // CraftBukkit start - Once done saving, we should turn it back off to avoid confusion if it was originally off.
                 this.print(s1, "Save complete.");
             } else if (s.toLowerCase().startsWith("save-off")) {
                 this.print(s1, "Disabling level saving..");