diff --git a/mopidy_soundcloud/soundcloud.py b/mopidy_soundcloud/soundcloud.py
index cf55dc4..d7c4b9d 100644
--- a/mopidy_soundcloud/soundcloud.py
+++ b/mopidy_soundcloud/soundcloud.py
@@ -134,7 +134,7 @@ def get_groups(self, query_group_id=None):
             for track in web_tracks:
                 if 'track' in track.get('kind'):
                     tracks.append(self.parse_track(track))
-            return tracks
+            return self.sanitize_tracks(tracks)
         else:
             return self._get('me/groups.json')
 
@@ -185,7 +185,7 @@ def get_user_liked(self):
             if pl:
                 likes.append((pl['title'], str(pl['id'])))
 
-        return likes
+        return self.sanitize_tracks(likes)
 
     # Public
     @cache()
@@ -322,5 +322,4 @@ def resolve_tracks(self, track_ids):
         pool = ThreadPool(processes=16)
         tracks = pool.map(self.get_track, track_ids)
         pool.close()
-        tracks = [t for t in tracks if t is not None]
-        return tracks
+        return self.sanitize_tracks(tracks)