diff --git a/src/types/commands.rs b/src/types/commands.rs
index 8e149eb..ecb4dbf 100644
--- a/src/types/commands.rs
+++ b/src/types/commands.rs
@@ -197,7 +197,7 @@ impl Executable for GetVolumeCommand {
         let volume = audio_player.get_volume(self.id);
 
         if let Some(volume) = volume {
-        Response::new(true, volume.to_string())
+            Response::new(true, volume.to_string())
         } else {
             Response::new(false, "Failed to get volume")
         }
diff --git a/src/utils/gui.rs b/src/utils/gui.rs
index 45a3d3d..9687666 100644
--- a/src/utils/gui.rs
+++ b/src/utils/gui.rs
@@ -55,7 +55,9 @@ pub fn start_app_state_thread(audio_player_state_shared: Arc<Mutex<AudioPlayerSt
 
             if !is_running {
                 {
-                    let mut guard = audio_player_state_shared.lock().unwrap();
+                    let mut guard = audio_player_state_shared
+                        .lock()
+                        .unwrap_or_else(|e| e.into_inner());
                     guard.is_daemon_running = false;
                 }
                 sleep(Duration::from_millis(500)).await;
@@ -69,7 +71,9 @@ pub fn start_app_state_thread(audio_player_state_shared: Arc<Mutex<AudioPlayerSt
                 let full_state: FullState =
                     serde_json::from_str(&full_state_res.message).unwrap_or_default();
 
-                let mut guard = audio_player_state_shared.lock().unwrap();
+                let mut guard = audio_player_state_shared
+                    .lock()
+                    .unwrap_or_else(|e| e.into_inner());
 
                 guard.state = match guard.new_state.clone() {
                     Some(new_state) => {