diff --git a/mopidy/audio/tags.py b/mopidy/audio/tags.py
index 78c09775..bdf58600 100644
--- a/mopidy/audio/tags.py
+++ b/mopidy/audio/tags.py
@@ -106,7 +106,7 @@ def convert_tags_to_track(tags):
     album_kwargs['num_discs'] = tags.get(Gst.TAG_ALBUM_VOLUME_COUNT, [None])[0]
     album_kwargs['musicbrainz_id'] = tags.get('musicbrainz-albumid', [None])[0]
 
-    track_kwargs['date'] = tags.get(Gst.TAG_DATE, [None])[0]
+    album_kwargs['date'] = tags.get(Gst.TAG_DATE, [None])[0]
 
     # Clear out any empty values we found
     track_kwargs = {k: v for k, v in track_kwargs.items() if v}
diff --git a/tests/audio/test_tags.py b/tests/audio/test_tags.py
index 4619273b..6dfa909d 100644
--- a/tests/audio/test_tags.py
+++ b/tests/audio/test_tags.py
@@ -111,10 +111,11 @@ class TagsToTrackTest(unittest.TestCase):
         albumartist = Artist(name='albumartist',
                              musicbrainz_id='albumartistid')
 
-        album = Album(name='album', num_tracks=2, num_discs=3,
+        album = Album(name='album', date='2006-01-01',
+                      num_tracks=2, num_discs=3,
                       musicbrainz_id='albumid', artists=[albumartist])
 
-        self.track = Track(name='track', date='2006-01-01',
+        self.track = Track(name='track',
                            genre='genre', track_no=1, disc_no=2,
                            comment='comment', musicbrainz_id='trackid',
                            album=album, bitrate=1000, artists=[artist],
@@ -177,7 +178,8 @@ class TagsToTrackTest(unittest.TestCase):
 
     def test_missing_track_date(self):
         del self.tags['date']
-        self.check(self.track.replace(date=None))
+        self.check(
+            self.track.replace(album=self.track.album.replace(date=None)))
 
     def test_multiple_track_date(self):
         self.tags['date'].append('2030-01-01')