diff --git a/android/src/com/mapswithme/maps/NewsFragment.java b/android/src/com/mapswithme/maps/NewsFragment.java
index 308e6468ca..256605733c 100644
--- a/android/src/com/mapswithme/maps/NewsFragment.java
+++ b/android/src/com/mapswithme/maps/NewsFragment.java
@@ -96,21 +96,21 @@ public class NewsFragment extends BaseMwmDialogFragment
 
         final SwitchCompat checkBox = (SwitchCompat)switchBlock.findViewById(R.id.switch_box);
         checkBox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener()
+        {
+          @Override
+          public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
           {
-            @Override
-            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
-            {
-              Framework.Params3dMode _3d = new Framework.Params3dMode();
-              Framework.nativeGet3dMode(_3d);
+            Framework.Params3dMode _3d = new Framework.Params3dMode();
+            Framework.nativeGet3dMode(_3d);
 
-              if (position == 0)
-                _3d.enabled = isChecked;
-              else
-                _3d.buildings = isChecked;
+            if (position == 0)
+              _3d.enabled = isChecked;
+            else
+              _3d.buildings = isChecked;
 
-              Framework.nativeSet3dMode(_3d.enabled, _3d.buildings);
-            }
-          });
+            Framework.nativeSet3dMode(_3d.enabled, _3d.buildings);
+          }
+        });
 
         switchBlock.setOnClickListener(new View.OnClickListener()
         {
@@ -120,7 +120,6 @@ public class NewsFragment extends BaseMwmDialogFragment
             checkBox.performClick();
           }
         });
-
       }
 
       container.addView(res);
@@ -255,9 +254,6 @@ public class NewsFragment extends BaseMwmDialogFragment
 
     Config.setWhatsNewShown();
 
-    // Enable 3D by default
-    Framework.nativeSet3dMode(true, true);
-
     try
     {
       final NewsFragment fragment = NewsFragment.class.newInstance();
diff --git a/map/framework.cpp b/map/framework.cpp
index d38ce54c75..dbb4af00fa 100644
--- a/map/framework.cpp
+++ b/map/framework.cpp
@@ -1283,8 +1283,8 @@ void Framework::CreateDrapeEngine(ref_ptr<dp::OGLContextFactory> contextFactory,
       ActivateUserMark(mark, true);
   }
 
-  bool allow3d = true;
-  bool allow3dBuildings = true;
+  bool allow3d;
+  bool allow3dBuildings;
   Load3dMode(allow3d, allow3dBuildings);
   Allow3dMode(allow3d, allow3dBuildings);
 
@@ -2094,8 +2094,11 @@ void Framework::Save3dMode(bool allow3d, bool allow3dBuildings)
   Settings::Set(kAllow3dBuildingsKey, allow3dBuildings);
 }
 
-void Framework::Load3dMode(bool &allow3d, bool &allow3dBuildings)
+void Framework::Load3dMode(bool & allow3d, bool & allow3dBuildings)
 {
-  Settings::Get(kAllow3dKey, allow3d);
-  Settings::Get(kAllow3dBuildingsKey, allow3dBuildings);
+  if (!Settings::Get(kAllow3dKey, allow3d))
+    allow3d = true;
+
+  if (!Settings::Get(kAllow3dBuildingsKey, allow3dBuildings))
+    allow3dBuildings = true;
 }