diff --git a/voicelink/player.py b/voicelink/player.py
index 2fd56ae..e90aeb8 100644
--- a/voicelink/player.py
+++ b/voicelink/player.py
@@ -345,7 +345,7 @@ class Player(VoiceProtocol):
         self.shuffle_votes.clear()
         self.stop_votes.clear()
 
-        track: Track = self.queue.get()
+        track = self.queue.get()
 
         if not track:
             if self.settings.get("autoplay", False) and await self.get_recommendations():
@@ -762,7 +762,7 @@ class Player(VoiceProtocol):
         if self.volume != 100:
             await self.set_volume(self.volume)
     
-    async def get_recommendations(self, *, track: Track = None) -> bool:
+    async def get_recommendations(self, *, track: Optional[Track] = None) -> bool:
         """Get recommendations from Youtube or Spotify."""
         if not track:
             try:
diff --git a/voicelink/pool.py b/voicelink/pool.py
index 3797356..a79da7f 100644
--- a/voicelink/pool.py
+++ b/voicelink/pool.py
@@ -515,12 +515,12 @@ class Node:
             )
             for track in tracks ]
 
-    async def get_recommendations(self, track: Track, limit: int = None) -> List[Track]:
-        if not self.spotify_client:
-            return
-        
+    async def get_recommendations(self, track: Track, limit: int = None) -> List[Optional[Track]]:
         if track.spotify:
-            spotify_tracks = await self._spotify_client.similar_track(seed_tracks=track.identifier, limit=limit)
+            if not self.spotify_client:
+                return []
+            
+            spotify_tracks = await self.spotify_client.similar_track(seed_tracks=track.identifier, limit=limit)
             
             tracks = [
                 Track(