diff --git a/src/UI/Activity/Queue/QueueActionsCell.js b/src/UI/Activity/Queue/QueueActionsCell.js
index eb2297fda..ad3f75144 100644
--- a/src/UI/Activity/Queue/QueueActionsCell.js
+++ b/src/UI/Activity/Queue/QueueActionsCell.js
@@ -23,7 +23,8 @@ module.exports = TemplatedCell.extend({
     },
 
     _remove : function() {
-        var showBlacklist = this.model.get('status') !== 'Pending';
+        var status = this.model.get('status');
+        var showBlacklist = status !== 'Delay' && status !== 'DownloadClientUnavailable';
 
         vent.trigger(vent.Commands.OpenModalCommand, new RemoveFromQueueView({
             model         : this.model,
diff --git a/src/UI/Activity/Queue/QueueActionsCellTemplate.hbs b/src/UI/Activity/Queue/QueueActionsCellTemplate.hbs
index 13bee034e..01e5b34ab 100644
--- a/src/UI/Activity/Queue/QueueActionsCellTemplate.hbs
+++ b/src/UI/Activity/Queue/QueueActionsCellTemplate.hbs
@@ -4,9 +4,16 @@
     {{/if_eq}}
 {{/if_eq}}
 
-{{#if_eq status compare="Pending"}}
+{{#if_eq status compare="Delay"}}
     <i class="icon-sonarr-download x-grab" title="Add to download queue (Override Delay Profile)"></i>
     <i class="icon-sonarr-delete x-remove" title="Remove pending release"></i>
 {{else}}
-    <i class="icon-sonarr-delete x-remove" title="Remove from download client"></i>
+    {{#unless_eq status compare="DownloadClientUnavailable"}}
+        <i class="icon-sonarr-delete x-remove" title="Remove from download client"></i>
+    {{/unless_eq}}
+{{/if_eq}}
+
+{{#if_eq status compare="DownloadClientUnavailable"}}
+    <i class="icon-sonarr-download x-grab" title="Add to download queue (Retry failed download)"></i>
+    <i class="icon-sonarr-delete x-remove" title="Remove pending release"></i>
 {{/if_eq}}