diff --git a/src/redux/map/sagas.ts b/src/redux/map/sagas.ts
index 570b6ac..37950ee 100644
--- a/src/redux/map/sagas.ts
+++ b/src/redux/map/sagas.ts
@@ -118,16 +118,14 @@ export function* loadMapFromPath() {
     const map = yield call(loadMapSaga, path);
 
     if (!map) {
-      yield call(setReadySaga);
-      return yield call(startEmptyEditorSaga);
+      yield call(startEmptyEditorSaga);
+      return
     }
 
     yield put(editorSetEditing(mode && mode === 'edit'));
-    yield call(setReadySaga);
     return;
   }
 
-  yield call(setReadySaga);
   yield call(startEmptyEditorSaga);
 }
 
@@ -153,6 +151,7 @@ export function* mapInitSaga() {
   }
 
   yield call(loadMapFromPath);
+  yield call(setReadySaga);
   pushLoaderState(100);
 }