diff --git a/DeskThingServer/package.json b/DeskThingServer/package.json
index c22c4ab2..e34ea32a 100644
--- a/DeskThingServer/package.json
+++ b/DeskThingServer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "deskthing",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "A DeskThing server UI to interface with the DeskThing car thing app",
   "main": "./out/main/index.js",
   "author": "Riprod",
diff --git a/DeskThingServer/src/main/handlers/musicHandler.ts b/DeskThingServer/src/main/handlers/musicHandler.ts
index 2d7cbe08..0d9cc27f 100644
--- a/DeskThingServer/src/main/handlers/musicHandler.ts
+++ b/DeskThingServer/src/main/handlers/musicHandler.ts
@@ -35,7 +35,7 @@ export class MusicHandler {
 
     dataListener.asyncEmit(
       MESSAGE_TYPES.LOGGING,
-      `[MusicHandler]: Received settings update - checking for changes`
+      `[MusicHandler]: Received settings update - checking for changes | Playback location: ${settings.playbackLocation}`
     )
     if (settings.playbackLocation) {
       dataListener.asyncEmit(
@@ -66,7 +66,7 @@ export class MusicHandler {
     if (!this.currentApp || this.currentApp.length == 0) {
       dataListener.asyncEmit(
         MESSAGE_TYPES.ERROR,
-        `[MusicHandler]: No playback location set! Go to settings -> Music to the playback location!`
+        `[MusicHandler]: No playback location set! Go to settings -> Music to set the playback location!`
       )
       return
     }
@@ -98,6 +98,15 @@ export class MusicHandler {
         return
       }
     }
+
+    if (this.currentApp == 'none') {
+      dataListener.asyncEmit(
+        MESSAGE_TYPES.ERROR,
+        `[MusicHandler]: Playback location is 'none' ! Go to settings -> Music to set the playback location!`
+      )
+      return
+    }
+
     if (request.app != 'music' && request.app != 'utility') return
 
     if (request.app == 'utility') {
diff --git a/DeskThingServer/src/main/stores/settingsStore.ts b/DeskThingServer/src/main/stores/settingsStore.ts
index f14e9ada..2035c0ff 100644
--- a/DeskThingServer/src/main/stores/settingsStore.ts
+++ b/DeskThingServer/src/main/stores/settingsStore.ts
@@ -3,8 +3,8 @@ import dataListener, { MESSAGE_TYPES } from '../utils/events'
 import os from 'os'
 import { Settings } from '@shared/types'
 
-const settingsVersion = '0.9.1'
-const version_code = 9.1
+const settingsVersion = '0.9.2'
+const version_code = 9.2
 
 class SettingsStore {
   private settings: Settings
@@ -117,7 +117,7 @@ class SettingsStore {
       globalADB: false,
       autoDetectADB: false,
       refreshInterval: -1,
-      playbackLocation: undefined,
+      playbackLocation: 'none',
       localIp: getLocalIpAddress(),
       appRepos: ['https://github.com/ItsRiprod/deskthing-apps'],
       clientRepos: ['https://github.com/ItsRiprod/deskthing-client']
diff --git a/DeskThingServer/src/renderer/src/overlays/settings/MusicSettings.tsx b/DeskThingServer/src/renderer/src/overlays/settings/MusicSettings.tsx
index 6a2b7bb8..9b70bf3d 100644
--- a/DeskThingServer/src/renderer/src/overlays/settings/MusicSettings.tsx
+++ b/DeskThingServer/src/renderer/src/overlays/settings/MusicSettings.tsx
@@ -88,6 +88,9 @@ const MusicSettings: React.FC = () => {
               {app.name}
             </option>
           ))}
+          <option key={'none'} value={'none'} className="rounded-none">
+            {'None'}
+          </option>
         </select>
       </div>
       <div className="border-t py-5 border-gray-500 w-full flex justify-end">