diff --git a/RedBookPlayer.Common/Discs/CompactDisc.cs b/RedBookPlayer.Common/Discs/CompactDisc.cs
index 8f123ef..2dc5b99 100644
--- a/RedBookPlayer.Common/Discs/CompactDisc.cs
+++ b/RedBookPlayer.Common/Discs/CompactDisc.cs
@@ -62,9 +62,6 @@ namespace RedBookPlayer.Common.Discs
                     // Set track flags from subchannel data, if possible
                     SetTrackFlags(track);
 
-                    TotalIndexes = track.Indexes.Keys.Max();
-                    CurrentTrackIndex = track.Indexes.Keys.Min();
-
                     // If the track is playable, just return
                     if(TrackType == TrackType.Audio || _loadDataTracks)
                         break;
@@ -78,6 +75,9 @@ namespace RedBookPlayer.Common.Discs
                 while(cachedValue != _currentTrackNumber);
 
                 this.RaiseAndSetIfChanged(ref _currentTrackNumber, cachedTrackNumber);
+
+                TotalIndexes = GetTrack(_currentTrackNumber).Indexes.Keys.Max();
+                CurrentTrackIndex = GetTrack(_currentTrackNumber).Indexes.Keys.Min();
             }
         }