diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/SavestateHandlerServer.java b/src/main/java/com/minecrafttas/tasmod/savestates/SavestateHandlerServer.java
index 05f91369..6ba4b3e7 100644
--- a/src/main/java/com/minecrafttas/tasmod/savestates/SavestateHandlerServer.java
+++ b/src/main/java/com/minecrafttas/tasmod/savestates/SavestateHandlerServer.java
@@ -239,7 +239,7 @@ public void saveState(int savestateIndex, boolean tickrate0, boolean changeIndex
 		server.getPlayerList().sendMessage(new TextComponentString(TextFormatting.GREEN + "Savestate " + indexToSave + " saved"));
 
 		try {
-			// close GuiSavestateScreen
+			// Close GuiSavestateScreen
 			TASmod.server.sendToAll(new TASmodBufferBuilder(TASmodPackets.CLEAR_SCREEN));
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -700,8 +700,10 @@ public void loadCurrentIndexFromFile() {
 			file.load(savestateDat);
 
 			index = Integer.parseInt(file.get(DataValues.INDEX));
-
-			setCurrentIndex(index);
+			if (index != 0)
+				setCurrentIndex(index);
+			else
+				setCurrentIndex(latestIndex);
 		}
 	}