diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
index f9cacd923a1..8d141fc4ecc 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/AppPreferences.java
@@ -62,7 +62,11 @@ public class AppPreferences {
     }
 
     public static AppPreferences on(Context context, String preferenceName) {
-        return new AppPreferences(context, preferenceName);
+        return new AppPreferences(context, preferenceName, true);
+    }
+
+    public static AppPreferences on(Context context, String preferenceName, boolean overload) {
+        return new AppPreferences(context, preferenceName, overload);
     }
 
     protected final Context context;
@@ -86,9 +90,16 @@ public class AppPreferences {
         helper = new Helper(PreferenceManager.getDefaultSharedPreferences(context), null);
     }
 
-    public AppPreferences(Context context, String preferenceName) {
+    public AppPreferences(Context context, String preferenceName, boolean overload) {
         this.context = context;
-        helper = new Helper(PreferenceManager.getDefaultSharedPreferences(context), context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE));
+
+        SharedPreferences defaultSharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences customSharedPreferences = context.getSharedPreferences(preferenceName, Context.MODE_PRIVATE);
+        if (overload) {
+            helper = new Helper(defaultSharedPreferences, customSharedPreferences);
+        } else {
+            helper = new Helper(customSharedPreferences, null);
+        }
     }
 
     public void setAuthor(AbstractLogEventAuthor author) {
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
index c2b26263c24..8304f7d7a71 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/activities/RacingActivity.java
@@ -679,7 +679,7 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
 
             RegattaConfiguration configuration = raceGroup.getRegattaConfiguration();
             if (configuration instanceof RegattaConfigurationImpl) {
-                AppPreferences preferences = AppPreferences.on(this, regattaPreference);
+                AppPreferences preferences = AppPreferences.on(this, regattaPreference, false);
                 PreferencesRegattaConfigurationLoader preferencesLoader = new PreferencesRegattaConfigurationLoader(configuration, preferences);
                 preferencesLoader.store();
             }