diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java
index a35108172cb..bfd4413bf60 100755
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/RegattaFragment.java
@@ -82,15 +82,6 @@ public class RegattaFragment extends BaseFragment implements OnClickListener {
         }
     }
 
-    private void checkAndSwitchToThankYouScreenIfRegattaOver() {
-        RegattaActivity regattaActivity = (RegattaActivity) getActivity();
-        long regattaEnd = regattaActivity.event.endMillis;
-
-        if (System.currentTimeMillis() > regattaEnd) {
-            switchToThankYouScreen();
-        }
-    }
-
     /**
      * If the regatta started, don't display the countdown any more.
      */
@@ -148,7 +139,6 @@ public class RegattaFragment extends BaseFragment implements OnClickListener {
         }
         timer = new TimerRunnable();
         timer.start();
-        //checkAndSwitchToThankYouScreenIfRegattaOver();
         checkAndHideCountdownIfRegattaIsInProgress();
     }