diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index dae9f702e7..e586a1e124 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -511,7 +511,9 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
 
         function getSaveablePlaylistItems() {
             return getPlaylistItems(currentPlayer).then(function (items) {
-                    return i.Id && i.ServerId
+                return items.filter(function (i) {
+                    return i.Id && i.ServerId;
+                });
             });
         }