diff --git a/SpotifyRecorder.py b/SpotifyRecorder.py
index 04ba964423b3fd0233327b607d7f5928c3990d2a..05c44ef134bc2fa4db048bc8c6d9ebed21cf4fdd 100644
--- a/SpotifyRecorder.py
+++ b/SpotifyRecorder.py
@@ -60,6 +60,13 @@ class SpotifyRecorder:
         playlist = self.__get_playlist(self._playlist['user'], self._playlist['id'])
         tracks = self.__get_tracks(playlist)
 
+        if self._limit == -1:
+            LOGGER.info(f'Recording track #{self._startNumber} to end of playlist')
+            tracks = tracks[self._startNumber - 1:]
+        else:
+            LOGGER.info(f'Recording track #{self._startNumber} to (including) #{self._startNumber + self._limit - 1}')
+            tracks = tracks[self._startNumber - 1:self._startNumber - 1 + self._limit]
+
         self.__record_tracks(tracks)
 
     def __get_playlist(self, username: str, playlistID: str) -> Dict:
@@ -87,13 +94,6 @@ class SpotifyRecorder:
         skippedTrackNumbers = []
         errorTrackNumbers = []
 
-        if self._limit == -1:
-            LOGGER.info(f'Recording track #{self._startNumber} to all')
-            tracks = tracks[self._startNumber - 1:]
-        else:
-            LOGGER.info(f'Recording track #{self._startNumber} to (including) #{self._startNumber + self._limit - 1}')
-            tracks = tracks[self._startNumber - 1:self._startNumber - 1 + self._limit]
-
         for index, track in enumerate(tracks):
             indexInPlaylist = self._startNumber + index