diff --git a/cmd/daemon/player.go b/cmd/daemon/player.go
index 81deb52..0c623dc 100644
--- a/cmd/daemon/player.go
+++ b/cmd/daemon/player.go
@@ -220,9 +220,11 @@ func (p *AppPlayer) handlePlayerCommand(req dealer.RequestPayload) error {
 		p.state.player.Suppressions = req.Command.Options.Suppressions
 
 		// apply overrides
-		p.state.player.Options.ShufflingContext = req.Command.Options.PlayerOptionsOverride.ShufflingContext
-		p.state.player.Options.RepeatingTrack = req.Command.Options.PlayerOptionsOverride.RepeatingTrack
-		p.state.player.Options.RepeatingContext = req.Command.Options.PlayerOptionsOverride.RepeatingContext
+		if req.Command.Options.PlayerOptionsOverride != nil {
+			p.state.player.Options.ShufflingContext = req.Command.Options.PlayerOptionsOverride.ShufflingContext
+			p.state.player.Options.RepeatingTrack = req.Command.Options.PlayerOptionsOverride.RepeatingTrack
+			p.state.player.Options.RepeatingContext = req.Command.Options.PlayerOptionsOverride.RepeatingContext
+		}
 
 		var skipTo skipToFunc
 		if len(req.Command.Options.SkipTo.TrackUri) > 0 || len(req.Command.Options.SkipTo.TrackUid) > 0 || req.Command.Options.SkipTo.TrackIndex > 0 {