 					continue
 				}
 
-				let isActiveDevice = outputDevice == currentOutputDevice
+				let isActiveDevice = outputDevice.objectID == currentOutputDeviceID
 				let deviceMenuItem = NSMenuItem(title: try outputDevice.name(), action: #selector(PlayerWindowController.selectDevice(_:)), keyEquivalent: "")
 				deviceMenuItem.target = self
 				deviceMenuItem.representedObject = outputDevice

			return
		}

		try? player.setOutputDevice(device)
	}

	// MARK: - Player Control

			}
		}

		if let uid = UserDefaults.standard.object(forKey: "deviceUID") as? String, let deviceID = try? AudioSystemObject.instance.deviceID(forUID: uid) {
			try? player.setOutputDeviceID(deviceID)
		}

		updateDeviceMenu()
