diff --git a/docs/changelog.rst b/docs/changelog.rst
index 26a115e5..dafbb794 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -26,6 +26,8 @@ Bug fix release.
 - Main: Catch errors when loading :confval:`logging/config_file`. (Fixes:
   :issue:`1320`)
 
+- MPD: Don't return tracks with empty URIs. (Partly fixes: :issue:`1340`)
+
 
 v1.1.1 (2015-09-14)
 ===================
diff --git a/mopidy/mpd/translator.py b/mopidy/mpd/translator.py
index b601fd4b..a76d6d59 100644
--- a/mopidy/mpd/translator.py
+++ b/mopidy/mpd/translator.py
@@ -172,7 +172,9 @@ def tracks_to_mpd_format(tracks, start=0, end=None):
     assert len(tracks) == len(positions)
     result = []
     for track, position in zip(tracks, positions):
-        result.append(track_to_mpd_format(track, position))
+        formatted_track = track_to_mpd_format(track, position)
+        if formatted_track:
+            result.append(formatted_track)
     return result
 
 
diff --git a/tests/mpd/test_translator.py b/tests/mpd/test_translator.py
index 65c80bbb..e1ef703d 100644
--- a/tests/mpd/test_translator.py
+++ b/tests/mpd/test_translator.py
@@ -56,7 +56,7 @@ class TrackMpdFormatTest(unittest.TestCase):
 
     def test_track_to_mpd_format_with_position_and_tlid(self):
         result = translator.track_to_mpd_format(
-            TlTrack(2, Track()), position=1)
+            TlTrack(2, Track(uri='a uri')), position=1)
         self.assertIn(('Pos', 1), result)
         self.assertIn(('Id', 2), result)
 
@@ -153,13 +153,17 @@ class PlaylistMpdFormatTest(unittest.TestCase):
 
     def test_mpd_format(self):
         playlist = Playlist(tracks=[
-            Track(track_no=1), Track(track_no=2), Track(track_no=3)])
+            Track(uri='foo', track_no=1),
+            Track(uri='bar', track_no=2),
+            Track(uri='baz', track_no=3)])
         result = translator.playlist_to_mpd_format(playlist)
         self.assertEqual(len(result), 3)
 
     def test_mpd_format_with_range(self):
         playlist = Playlist(tracks=[
-            Track(track_no=1), Track(track_no=2), Track(track_no=3)])
+            Track(uri='foo', track_no=1),
+            Track(uri='bar', track_no=2),
+            Track(uri='baz', track_no=3)])
         result = translator.playlist_to_mpd_format(playlist, 1, 2)
         self.assertEqual(len(result), 1)
         self.assertEqual(dict(result[0])['Track'], 2)