diff --git a/MixItUp.Base/ViewModel/MainControls/MusicPlayerMainControlViewModel.cs b/MixItUp.Base/ViewModel/MainControls/MusicPlayerMainControlViewModel.cs
index bb0be3d83..dda25bbd3 100644
--- a/MixItUp.Base/ViewModel/MainControls/MusicPlayerMainControlViewModel.cs
+++ b/MixItUp.Base/ViewModel/MainControls/MusicPlayerMainControlViewModel.cs
@@ -41,7 +41,7 @@ public int Volume
             get { return ServiceManager.Get<IMusicPlayerService>().Volume; }
             set
             {
-                ServiceManager.Get<IMusicPlayerService>().ChangeVolume(value).Wait();
+                _ = ServiceManager.Get<IMusicPlayerService>().ChangeVolume(value);
                 this.NotifyPropertyChanged();
             }
         }
diff --git a/MixItUp.WPF/Services/WindowsMusicPlayerService.cs b/MixItUp.WPF/Services/WindowsMusicPlayerService.cs
index d13888f80..6d772735e 100644
--- a/MixItUp.WPF/Services/WindowsMusicPlayerService.cs
+++ b/MixItUp.WPF/Services/WindowsMusicPlayerService.cs
@@ -97,7 +97,7 @@ public async Task Play()
                         this.sempahore.Release();
                     }
 
-                    this.SongChanged.Invoke(this, new EventArgs());
+                    DispatcherHelper.Dispatcher.Invoke(() => this.SongChanged.Invoke(this, new EventArgs()));
 
                     await ServiceManager.Get<CommandService>().Queue(ChannelSession.Settings.MusicPlayerOnSongChangedCommandID, new CommandParametersModel(ChannelSession.User, platform: StreamingPlatformTypeEnum.All));
                 }