diff --git a/core/src/cz/nic/tablexia/Tablexia.java b/core/src/cz/nic/tablexia/Tablexia.java
index d33f288e502d4c0202a1e27be410f4cf245ceb88..2cb6fa1b42faf487aefb9ed0b6d50021d9df7a48 100644
--- a/core/src/cz/nic/tablexia/Tablexia.java
+++ b/core/src/cz/nic/tablexia/Tablexia.java
@@ -122,7 +122,7 @@ public class Tablexia extends TablexiaApplication {
 
     private void startLoading(Locale locale) {
         // sync loaded screen with loader image
-        setScreenIfIsDifferent(Utility.getScreenForScreenClass(TablexiaSettings.LOADER_SCREEN, null));
+        setScreen(Utility.getScreenForScreenClass(TablexiaSettings.LOADER_SCREEN, null));
 
         // async internal assets loading
 		ApplicationFontManager.getInstance().load();
diff --git a/core/src/cz/nic/tablexia/TablexiaApplication.java b/core/src/cz/nic/tablexia/TablexiaApplication.java
index f68dbbfcfde4cea93364c2aba5f72901c39319d2..c06675820527b85ccd8f223f4332376e76ef445e 100644
--- a/core/src/cz/nic/tablexia/TablexiaApplication.java
+++ b/core/src/cz/nic/tablexia/TablexiaApplication.java
@@ -512,7 +512,7 @@ public abstract class TablexiaApplication implements ApplicationListener {
      */
     public void setScreenIfIsDifferent(AbstractTablexiaScreen<?> newScreen, ScreenTransaction screenTransaction) {
         if (newScreen != null) {
-            if (getScreen() == null || getScreen().getClass() != newScreen.getClass()  || LoaderScreen.class.equals(newScreen.getClass())) {
+            if (getScreen() == null || getScreen().getClass() != newScreen.getClass() || TablexiaSettings.LOADER_SCREEN.equals(newScreen.getClass())) {
                 setScreen(newScreen, screenTransaction);
             }
         }
diff --git a/core/src/cz/nic/tablexia/TablexiaSettings.java b/core/src/cz/nic/tablexia/TablexiaSettings.java
index 6320c21a03efea15181945aa80b234bb34b3421a..e2d34fbd9d0dd607e4be34d7f98a5cfe50ab2029 100644
--- a/core/src/cz/nic/tablexia/TablexiaSettings.java
+++ b/core/src/cz/nic/tablexia/TablexiaSettings.java
@@ -14,12 +14,10 @@ import cz.nic.tablexia.game.GameDefinition;
 import cz.nic.tablexia.game.difficulty.GameDifficulty;
 import cz.nic.tablexia.loader.application.ApplicationTextManager;
 import cz.nic.tablexia.model.UserDAO;
-import cz.nic.tablexia.shared.model.User;
 import cz.nic.tablexia.screen.AbstractTablexiaScreen;
 import cz.nic.tablexia.screen.gamemenu.GameMenuScreen;
 import cz.nic.tablexia.screen.loader.LoaderScreen;
-import cz.nic.tablexia.sync.work.PushDataToServer;
-import cz.nic.tablexia.sync.RestSynchronizationService;
+import cz.nic.tablexia.shared.model.User;
 import cz.nic.tablexia.util.Log;
 
 public class TablexiaSettings {
@@ -361,7 +359,6 @@ public class TablexiaSettings {
         preferences.flush();
         if (!lastLocale.getLocale().getLanguage().equals(localeDefinition.getLocale().getLanguage())) {
             ApplicationBus.getInstance().post(new LocaleChangedEvent(localeDefinition)).asynchronously();
-            ApplicationBus.getInstance().post(new Tablexia.ChangeScreenEvent(LOADER_SCREEN, null)).asynchronously();
         }
     }