diff --git a/src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java b/src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java
index bdd9aa7799..406e6d518d 100644
--- a/src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java
@@ -152,6 +152,10 @@ public class WhatsNewActivity extends FragmentActivity implements ViewPager.OnPa
     }
 
     static public void runIfNeeded(Context context) {
+        if (!context.getResources().getBoolean(R.bool.show_whats_new)) {
+            return;
+        }
+
         if (context instanceof WhatsNewActivity) {
             return;
         }
diff --git a/src/main/res/values/setup.xml b/src/main/res/values/setup.xml
index ea0aa1b947..69d9d0bc55 100644
--- a/src/main/res/values/setup.xml
+++ b/src/main/res/values/setup.xml
@@ -36,7 +36,7 @@
     <string name = "send_files_to_other_apps">on</string>
     <bool name = "share_via_link_feature">true</bool>
     <bool name = "share_with_users_feature">true</bool>
-    
+    <bool name="show_whats_new">true</bool>
     
     <!-- Colors -->
     <color name="login_text_color">@color/white</color>