diff --git a/mopidy/audio/utils.py b/mopidy/audio/utils.py
index 369e74b6..84d80cc3 100644
--- a/mopidy/audio/utils.py
+++ b/mopidy/audio/utils.py
@@ -123,7 +123,10 @@ def convert_tags_to_track(tags):
     track_kwargs = {k: v for k, v in track_kwargs.items() if v}
     album_kwargs = {k: v for k, v in album_kwargs.items() if v}
 
-    track_kwargs['album'] = Album(**album_kwargs)
+    # Only bother with album if we have a name to show.
+    if album_kwargs.get('name'):
+        track_kwargs['album'] = Album(**album_kwargs)
+
     return Track(**track_kwargs)
 
 
diff --git a/tests/audio/test_utils.py b/tests/audio/test_utils.py
index fd71f38e..b2028518 100644
--- a/tests/audio/test_utils.py
+++ b/tests/audio/test_utils.py
@@ -8,6 +8,8 @@ from mopidy.models import Album, Artist, Track
 
 
 # TODO: keep ids without name?
+# TODO: current test is trying to test everything at once with a complete tags
+# set, instead we might want to try with a minimal one making testing easier.
 class TagsToTrackTest(unittest.TestCase):
     def setUp(self):  # noqa
         self.tags = {
@@ -156,8 +158,7 @@ class TagsToTrackTest(unittest.TestCase):
 
     def test_missing_album_name(self):
         del self.tags['album']
-        album = self.track.album.copy(name=None)
-        self.check(self.track.copy(album=album))
+        self.check(self.track.copy(album=None))
 
     def test_multiple_album_name(self):
         self.tags['album'].append('album2')
diff --git a/tests/stream/test_library.py b/tests/stream/test_library.py
index d90610d2..b660a2d4 100644
--- a/tests/stream/test_library.py
+++ b/tests/stream/test_library.py
@@ -11,7 +11,7 @@ import gst  # noqa: pygst magic is needed to import correct gst
 
 import mock
 
-from mopidy.models import Album, Track
+from mopidy.models import Track
 from mopidy.stream import actor
 from mopidy.utils.path import path_to_uri
 
@@ -39,5 +39,5 @@ class LibraryProviderTest(unittest.TestCase):
 
     def test_lookup_converts_uri_metadata_to_track(self):
         library = actor.StreamLibraryProvider(self.backend, 100, [])
-        self.assertEqual([Track(length=4406, uri=self.uri, album=Album())],
+        self.assertEqual([Track(length=4406, uri=self.uri)],
                          library.lookup(self.uri))