diff --git a/schemata/playback-v1.json b/schemata/playback-v1.json
index 29c2300..7c97aa4 100644
--- a/schemata/playback-v1.json
+++ b/schemata/playback-v1.json
@@ -104,7 +104,7 @@
 		"Queue": {
 			"properties": {
 				"current": {
-					"description": "The zero-based index of the current song in MPD's queue.",
+					"description": "The zero-based index of the current song in MPD's queue. If MPD is currently stopped, then there is no current song in the queue, indicated by None.",
 					"title": "Current",
 					"type": "integer"
 				},
diff --git a/src/mpd_now_playable/mpd/convert/to_playback.py b/src/mpd_now_playable/mpd/convert/to_playback.py
index 29b2223..77adfa2 100644
--- a/src/mpd_now_playable/mpd/convert/to_playback.py
+++ b/src/mpd_now_playable/mpd/convert/to_playback.py
@@ -9,8 +9,8 @@ from .to_song import to_song
 
 def to_queue(mpd: MpdState) -> Queue:
 	return Queue(
-		current=int(mpd.current["pos"]),
-		next=int(mpd.status["nextsong"]),
+		current=option_fmap(int, mpd.current.get("pos")),
+		next=int(mpd.status.get("nextsong", 0)),
 		length=int(mpd.status["playlistlength"]),
 	)
 
diff --git a/src/mpd_now_playable/playback/queue.py b/src/mpd_now_playable/playback/queue.py
index 7c93741..df5e76c 100644
--- a/src/mpd_now_playable/playback/queue.py
+++ b/src/mpd_now_playable/playback/queue.py
@@ -3,8 +3,10 @@ from dataclasses import dataclass
 
 @dataclass(slots=True)
 class Queue:
-	#: The zero-based index of the current song in MPD's queue.
-	current: int
+	#: The zero-based index of the current song in MPD's queue. If MPD is
+	#: currently stopped, then there is no current song in the queue, indicated
+	#: by None.
+	current: int | None
 	#: The index of the next song to be played, taking into account random and
 	#: repeat playback settings.
 	next: int
diff --git a/src/mpd_now_playable/receivers/cocoa/convert/to_nsimage.py b/src/mpd_now_playable/receivers/cocoa/convert/to_nsimage.py
index 213914d..e8544ed 100644
--- a/src/mpd_now_playable/receivers/cocoa/convert/to_nsimage.py
+++ b/src/mpd_now_playable/receivers/cocoa/convert/to_nsimage.py
@@ -37,4 +37,4 @@ def ns_image_to_media_item_artwork(img: NSImage) -> MPMediaItemArtwork:
 	)
 
 
-MPD_LOGO = logo_to_ns_image()
+MPD_LOGO = ns_image_to_media_item_artwork(logo_to_ns_image())
diff --git a/src/mpd_now_playable/receivers/cocoa/now_playing.py b/src/mpd_now_playable/receivers/cocoa/now_playing.py
index 602006a..83ba472 100644
--- a/src/mpd_now_playable/receivers/cocoa/now_playing.py
+++ b/src/mpd_now_playable/receivers/cocoa/now_playing.py
@@ -1,7 +1,7 @@
 from collections.abc import Callable, Coroutine
 from typing import Literal
 
-from corefoundationasyncio import CoreFoundationEventLoop
+from AppKit import NSApplication, NSApplicationActivationPolicyAccessory
 from MediaPlayer import (
 	MPChangePlaybackPositionCommandEvent,
 	MPMusicPlaybackStatePlaying,
@@ -12,6 +12,8 @@ from MediaPlayer import (
 	MPRemoteCommandHandlerStatusSuccess,
 )
 
+from corefoundationasyncio import CoreFoundationEventLoop
+
 from ...config.model import CocoaReceiverConfig
 from ...playback import Playback
 from ...playback.state import PlaybackState
@@ -41,6 +43,9 @@ class CocoaNowPlayingReceiver(Receiver):
 		pass
 
 	async def start(self, player: Player) -> None:
+		NSApplication.sharedApplication().setActivationPolicy_(
+			NSApplicationActivationPolicyAccessory
+		)
 		self.cmd_center = MPRemoteCommandCenter.sharedCommandCenter()
 		self.info_center = MPNowPlayingInfoCenter.defaultCenter()
 
diff --git a/stubs/AppKit/__init__.pyi b/stubs/AppKit/__init__.pyi
index 30512c2..50b8fcc 100644
--- a/stubs/AppKit/__init__.pyi
+++ b/stubs/AppKit/__init__.pyi
@@ -2,32 +2,42 @@ from typing import Final, Literal
 
 from Foundation import CGSize
 
+NSApplicationActivationPolicyRegular: Final = 0
+NSApplicationActivationPolicyAccessory: Final = 1
+NSApplicationActivationPolicyProhibited: Final = 2
+NSApplicationActivationPolicy = Literal[0, 1, 2]
+
+class NSApplication:
+	@staticmethod
+	def sharedApplication() -> NSApplication: ...
+	def setActivationPolicy_(self, policy: NSApplicationActivationPolicy) -> bool: ...
+
 # There are many other operations available but we only actually use copy, so we don't need all of them here.
 NSCompositingOperationClear: Final = 0
 NSCompositingOperationCopy: Final = 1
 NSCompositingOperation = Literal[0, 1]
 
 class NSRect:
-    pass
+	pass
 
 def NSMakeRect(x: float, y: float, w: float, h: float) -> NSRect: ...
 
 class NSImage:
-    @staticmethod
-    def alloc() -> type[NSImage]: ...
-
-    @staticmethod
-    def initByReferencingFile_(file: str) -> NSImage: ...
-
-    @staticmethod
-    def initWithData_(data: bytes) -> NSImage: ...
-
-    @staticmethod
-    def initWithSize_(size: CGSize) -> NSImage: ...
-
-    def size(self) -> CGSize: ...
-
-    def lockFocus(self) -> None: ...
-    def unlockFocus(self) -> None: ...
-
-    def drawInRect_fromRect_operation_fraction_(self, inRect: NSRect, fromRect: NSRect, operation: NSCompositingOperation, fraction: float) -> None: ...
+	@staticmethod
+	def alloc() -> type[NSImage]: ...
+	@staticmethod
+	def initByReferencingFile_(file: str) -> NSImage: ...
+	@staticmethod
+	def initWithData_(data: bytes) -> NSImage: ...
+	@staticmethod
+	def initWithSize_(size: CGSize) -> NSImage: ...
+	def size(self) -> CGSize: ...
+	def lockFocus(self) -> None: ...
+	def unlockFocus(self) -> None: ...
+	def drawInRect_fromRect_operation_fraction_(
+		self,
+		inRect: NSRect,
+		fromRect: NSRect,
+		operation: NSCompositingOperation,
+		fraction: float,
+	) -> None: ...