1 files changed, 3 insertions, 2 deletions
diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java
index 8788be0..e9a7916 100644
--- a/same/src/main/java/com/orbekk/same/SameController.java
+++ b/same/src/main/java/com/orbekk/same/SameController.java
@@ -42,9 +42,10 @@ public class SameController {
                     "MasterService.json";
             master = Master.create(connections, serviceBroadcaster,
                     masterUrl, configuration.get("networkName"));
-            if (lastKnownState != null) {
-                master.resumeFrom(lastKnownState, masterId);
+            if (lastKnownState == null) {
+                lastKnownState = master.state;
             }
+            master.resumeFrom(lastKnownState, masterId);
             master.start();
             masterService.setService(master.getService());
         }