diff --git a/Persephone/State/Reducers/QueueReducer.swift b/Persephone/State/Reducers/QueueReducer.swift
index 3eec807..2d6cc24 100644
--- a/Persephone/State/Reducers/QueueReducer.swift
+++ b/Persephone/State/Reducers/QueueReducer.swift
@@ -33,7 +33,7 @@ func queueReducer(action: Action, state: QueueState?) -> QueueState {
     let newSongRowPos = action.queuePos
     state.queuePos = action.queuePos
 
-    if oldSongRowPos >= 0 {
+    if oldSongRowPos >= 0 && state.queue.count > 0 {
       state.queue[oldSongRowPos].isPlaying = false
     }
     if newSongRowPos >= 0 && state.queue.count > newSongRowPos {