diff --git a/src/components/itemContextMenu.js b/src/components/itemContextMenu.js
index 835d62f9b7..96f8f2d356 100644
--- a/src/components/itemContextMenu.js
+++ b/src/components/itemContextMenu.js
@@ -28,12 +28,21 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
             }
         }
 
-        if (playbackManager.getCurrentPlayer() !== null && options.stopPlayback) {
-            commands.push({
-                name: globalize.translate('StopPlayback'),
-                id: 'stopPlayback',
-                icon: 'stop'
-            });
+        if (playbackManager.getCurrentPlayer() !== null) {
+            if (options.stopPlayback) {
+                commands.push({
+                    name: globalize.translate('StopPlayback'),
+                    id: 'stopPlayback',
+                    icon: 'stop'
+                });
+            }
+            if (options.clearQueue) {
+                commands.push({
+                    name: globalize.translate('ClearQueue'),
+                    id: 'clearQueue',
+                    icon: 'clear_all'
+                });
+            }
         }
 
         if (playbackManager.canQueue(item)) {
@@ -435,6 +444,9 @@ define(['apphost', 'globalize', 'connectionManager', 'itemHelper', 'appRouter',
                 case 'stopPlayback':
                     playbackManager.stop();
                     break;
+                case 'clearQueue':
+                    playbackManager.clearQueue();
+                    break;
                 case 'record':
                     require(['recordingCreator'], function (recordingCreator) {
                         recordingCreator.show(itemId, serverId).then(getResolveFunction(resolve, id, true), getResolveFunction(resolve, id));
diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js
index ebae04b08a..a229fab4ba 100644
--- a/src/components/nowPlayingBar/nowPlayingBar.js
+++ b/src/components/nowPlayingBar/nowPlayingBar.js
@@ -584,6 +584,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
                         let options = {
                             play: false,
                             queue: false,
+                            clearQueue: true,
                             positionTo: contextButton
                         };
                         apiClient.getCurrentUser().then(function (user) {
diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index 33d781687b..ae94ba8d4d 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -3971,6 +3971,15 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         events.trigger(player, 'shufflequeuemodechange');
     };
 
+    PlaybackManager.prototype.clearQueue = function (clearCurrentItem = false, player = this._currentPlayer) {
+        if (player && !enableLocalPlaylistManagement(player)) {
+            return player.clearQueue(clearCurrentItem);
+        }
+
+        this._playQueueManager.clearPlaylist(clearCurrentItem);
+        events.trigger(player, 'playlistitemremove');
+    };
+
     PlaybackManager.prototype.trySetActiveDeviceName = function (name) {
 
         name = normalizeName(name);
diff --git a/src/components/playback/playqueuemanager.js b/src/components/playback/playqueuemanager.js
index 7d2f941f0a..2f411091c6 100644
--- a/src/components/playback/playqueuemanager.js
+++ b/src/components/playback/playqueuemanager.js
@@ -84,6 +84,14 @@ define([], function () {
         this._shuffleMode = 'Sorted';
     };
 
+    PlayQueueManager.prototype.clearPlaylist = function (clearCurrentItem = false) {
+        const currentPlaylistItem = this._playlist.splice(this.getCurrentPlaylistIndex(), 1)[0];
+        this._playlist = [];
+        if (!clearCurrentItem) {
+            this._playlist.push(currentPlaylistItem);
+        }
+    };
+
     function arrayInsertAt(destArray, pos, arrayToInsert) {
         var args = [];
         args.push(pos); // where to insert
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index fcc7a7fe42..6f02bed15d 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -190,6 +190,7 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
                 play: false,
                 queue: false,
                 stopPlayback: stopPlayback,
+                clearQueue: true,
                 openAlbum: false,
                 positionTo: contextButton
             };
@@ -551,14 +552,18 @@ define(['browser', 'datetime', 'backdrop', 'libraryBrowser', 'listView', 'imageL
 
         function onPlaylistItemRemoved(e, info) {
             var context = dlg;
-            var playlistItemIds = info.playlistItemIds;
+            if (info !== undefined) {
+                var playlistItemIds = info.playlistItemIds;
 
-            for (var i = 0, length = playlistItemIds.length; i < length; i++) {
-                var listItem = context.querySelector('.listItem[data-playlistItemId="' + playlistItemIds[i] + '"]');
+                for (var i = 0, length = playlistItemIds.length; i < length; i++) {
+                    var listItem = context.querySelector('.listItem[data-playlistItemId="' + playlistItemIds[i] + '"]');
 
-                if (listItem) {
-                    listItem.parentNode.removeChild(listItem);
+                    if (listItem) {
+                        listItem.parentNode.removeChild(listItem);
+                    }
                 }
+            } else {
+                onPlaylistUpdate();
             }
         }
 
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 02fb652bf7..41dd4cd507 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1564,5 +1564,6 @@
     "ButtonSyncPlay": "SyncPlay",
     "ButtonCast": "Cast",
     "ButtonPlayer": "Player",
-    "StopPlayback": "Stop playback"
+    "StopPlayback": "Stop playback",
+    "ClearQueue": "Clear queue"
 }
diff --git a/src/strings/es.json b/src/strings/es.json
index b86c958b55..960e5a8977 100644
--- a/src/strings/es.json
+++ b/src/strings/es.json
@@ -1574,5 +1574,6 @@
     "HeaderNewRepository": "Nuevo repositorio",
     "MessageNoRepositories": "Sin repositorios.",
     "Writers": "Escritores",
-    "StopPlayback": "Detener la reproducción"
+    "StopPlayback": "Detener la reproducción",
+    "ClearQueue": "Borrar la cola"
 }