diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
index e7683fc73..94ce9d403 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java
@@ -168,13 +168,15 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
         viewBinding.trackList.setEmptyView(viewBinding.trackListEmptyView);
         viewBinding.trackList.setOnItemClickListener((parent, view, position, trackIdId) -> {
             Track.Id trackId = new Track.Id(trackIdId);
-            Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordedActivity.class)
-                    .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
             if (recordingStatus.isRecording() && trackId.equals(recordingStatus.getTrackId())) {
                 // Is recording -> open record activity.
+                Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordingActivity.class)
+                        .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
                 startActivity(newIntent);
             } else {
                 // Not recording -> open detail activity.
+                Intent newIntent = IntentUtils.newIntent(TrackListActivity.this, TrackRecordedActivity.class)
+                        .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
                 ActivityOptions activityOptions = ActivityOptions.makeSceneTransitionAnimation(
                         this,
                         new Pair<>(view.findViewById(R.id.list_item_icon), TrackRecordedActivity.VIEW_TRACK_ICON));
diff --git a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
index 3871ba042..5a09b512e 100644
--- a/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
+++ b/src/main/java/de/dennisguse/opentracks/TrackRecordingActivity.java
@@ -119,7 +119,7 @@ public class TrackRecordingActivity extends AbstractActivity implements ChooseAc
             throw new RuntimeException("TrackId is mandatory");
         }
         if (contentProviderUtils.getTrack(trackId) == null) {
-            Log.w(TAG, "TrackId does not exists; cannot continue the recording.");
+            Log.w(TAG, "TrackId does not exists.");
             finish();
         }