diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
index e1eee8695aa..ee6c274870f 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
@@ -496,5 +496,7 @@
 
     <string name="preference_non_public_events_header">Zeige nicht öffentliche Events</string>
     <string name="preference_non_public_events_summary">Lade alle Events, auch die nicht öffentlichen.</string>
+    <string name="preference_race_results_header">Zeige Rennliste</string>
+    <string name="preference_race_results_summary">Erlaube Race-Manager die Zieleinlaufliste in der Finishing-Phase zu bearbeiten</string>
 
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
index 9ea02046b1e..b778bf1fb8a 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/preferences.xml
@@ -110,5 +110,8 @@
     </string-array>
 
     <string name="preference_non_public_events_key" translatable="false">show_non_public_events</string>
-    <bool name="preference_non_public_events_default" translatable="false">false</bool>
+    <bool name="preference_non_public_events_default">false</bool>
+    <string name="preference_race_results_key" translatable="false">allow_race_results</string>
+    <bool name="preference_race_results_default">false</bool>
+
 </resources>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
index 82318e4453e..c48822eb875 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
@@ -524,4 +524,7 @@
 
     <string name="preference_non_public_events_header">Show Non Public Events</string>
     <string name="preference_non_public_events_summary">Load all events including the no public one.</string>
+    <string name="preference_race_results_header">Show Race Results</string>
+    <string name="preference_race_results_summary">Allow race manager to edit race result while finishing phase</string>
+
 </resources>
diff --git a/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_general.xml b/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_general.xml
index 8ce2d002d79..4a1f5402f84 100644
--- a/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_general.xml
+++ b/mobile/com.sap.sailing.racecommittee.app/res/xml/preference_general.xml
@@ -66,6 +66,12 @@
             android:summary="@string/preference_non_public_events_summary"
             android:title="@string/preference_non_public_events_header"/>
 
+        <CheckBoxPreference
+            android:defaultValue="@bool/preference_race_results_default"
+            android:key="@string/preference_race_results_key"
+            android:summary="@string/preference_race_results_summary"
+            android:title="@string/preference_race_results_header"/>
+
         <CheckBoxPreference
             android:defaultValue="@bool/preference_allow_demo_default"
             android:key="@string/preference_allow_demo_key"
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 59e3983c24b..c5a37fdbac0 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
@@ -467,4 +467,9 @@ public class AppPreferences {
         return preferences.getBoolean(context.getString(R.string.preference_non_public_events_key),
             context.getResources().getBoolean(R.bool.preference_non_public_events_default)) ? "true" : "false";
     }
+
+    public boolean showRaceResults() {
+        return preferences.getBoolean(context.getString(R.string.preference_race_results_key),
+            context.getResources().getBoolean(R.bool.preference_race_results_default));
+    }
 }
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 b8f2a462cea..4ada0e437c3 100755
--- 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
@@ -62,6 +62,7 @@ import com.sap.sailing.racecommittee.app.ui.fragments.RaceListFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.RaceListFragment.RaceListCallbacks;
 import com.sap.sailing.racecommittee.app.ui.fragments.WelcomeFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.BaseFragment;
+import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.RaceFinishingFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.RaceFlagViewerFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.RaceSummaryFragment;
 import com.sap.sailing.racecommittee.app.ui.fragments.raceinfo.TrackingListFragment;
@@ -520,7 +521,11 @@ public class RacingActivity extends SessionActivity implements RaceListCallbacks
                 if (mSelectedRace.getStatus() != RaceLogRaceStatus.FINISHING) {
                     content = RaceFlagViewerFragment.newInstance();
                 } else {
-                    content = TrackingListFragment.newInstance(args, 1);
+                    if (preferences.showRaceResults()) {
+                        content = TrackingListFragment.newInstance(args, 1);
+                    } else {
+                        content = RaceFinishingFragment.newInstance();
+                    }
                 }
                 content.setArguments(args);
                 transaction.replace(R.id.race_content, content);
diff --git a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/FlagPanelFragment.java b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/FlagPanelFragment.java
index 507439f454b..1db6b2bc56f 100644
--- a/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/FlagPanelFragment.java
+++ b/mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/FlagPanelFragment.java
@@ -212,7 +212,11 @@ public class FlagPanelFragment extends BasePanelFragment {
                 changeVisibility(mRecallFlags, null, View.GONE);
                 changeVisibility(mCourseFlags, null, View.GONE);
                 changeVisibility(mBlueFirstFlag, null, View.GONE);
-                changeVisibility(mBlueLastFlag, null, View.VISIBLE);
+                if (preferences.showRaceResults()) {
+                    changeVisibility(mBlueLastFlag, null, View.VISIBLE);
+                } else {
+                    changeVisibility(mBlueLastFlag, null, View.GONE);
+                }
 
                 uncheckMarker(mRecallFlags);
                 uncheckMarker(mCourseFlags);