diff --git a/lib/entities/media_player/widgets/media_player_widgets.dart b/lib/entities/media_player/widgets/media_player_widgets.dart
index bb20bde..529a61f 100644
--- a/lib/entities/media_player/widgets/media_player_widgets.dart
+++ b/lib/entities/media_player/widgets/media_player_widgets.dart
@@ -441,7 +441,7 @@ class _MediaPlayerControlsState extends State<MediaPlayerControls> {
   }
 
   void _switchTo(entity) {
-    HomeAssistant().sendFromPlayerId = entity.enityId;
+    HomeAssistant().sendFromPlayerId = entity.entityId;
     _duplicateTo(entity);
   }
 
diff --git a/lib/pages/play_media.page.dart b/lib/pages/play_media.page.dart
index b1cbfac..5026ce1 100644
--- a/lib/pages/play_media.page.dart
+++ b/lib/pages/play_media.page.dart
@@ -232,6 +232,7 @@ class _PlayMediaPageState extends State<PlayMediaPage> {
 
   @override
   void dispose(){
+    HomeAssistant().sendFromPlayerId = null;
     _stateSubscription?.cancel();
     _refreshDataSubscription?.cancel();
     super.dispose();