diff --git a/Mac/Components/Queue/QueueViewController.swift b/Mac/Components/Queue/QueueViewController.swift
index d4d7878..5a0f2c7 100644
--- a/Mac/Components/Queue/QueueViewController.swift
+++ b/Mac/Components/Queue/QueueViewController.swift
@@ -42,9 +42,10 @@ class QueueViewController: NSViewController {
   override func keyDown(with event: NSEvent) {
     switch event.keyCode {
     case NSEvent.keyCodeBS:
-      let queuePos = queueView.selectedRow
-
-      App.mpdClient.removeSong(at: queuePos)
+        if queueView.numberOfRows > 0 {
+            let queuePos = queueView.selectedRow
+            App.mpdClient.removeSong(at: queuePos)
+        }
     default:
       nextResponder?.keyDown(with: event)
     }