diff --git a/components/PlayButton.tsx b/components/PlayButton.tsx
index 1f0c59fa..bda14004 100644
--- a/components/PlayButton.tsx
+++ b/components/PlayButton.tsx
@@ -10,6 +10,7 @@ import { TouchableOpacity, View } from "react-native";
 import CastContext, {
   PlayServicesState,
   useRemoteMediaClient,
+  useMediaStatus,
 } from "react-native-google-cast";
 import Animated, {
   Easing,
@@ -35,7 +36,8 @@ const MIN_PLAYBACK_WIDTH = 15;
 export const PlayButton: React.FC<Props> = ({ item, url, ...props }) => {
   const { showActionSheetWithOptions } = useActionSheet();
   const client = useRemoteMediaClient();
-  const { setCurrentlyPlayingState, isPlaying, currentlyPlaying } = usePlayback();
+  const { setCurrentlyPlayingState } = usePlayback();
+  const mediaStatus = useMediaStatus()
 
   const [colorAtom] = useAtom(itemThemeColorAtom);
 
@@ -63,9 +65,9 @@ export const PlayButton: React.FC<Props> = ({ item, url, ...props }) => {
         cancelButtonIndex,
       },
       async (selectedIndex: number | undefined) => {
-        const isOpeningCurrentlyPlayingMedia = isPlaying 
-          && currentlyPlaying?.item?.Name 
-          && currentlyPlaying?.item?.Name === item?.Name
+        const currentTitle = mediaStatus?.mediaInfo?.metadata?.title
+        const isOpeningCurrentlyPlayingMedia = currentTitle && currentTitle === item?.Name
+
         switch (selectedIndex) {
           case 0:
             await CastContext.getPlayServicesState().then((state) => {
@@ -73,8 +75,7 @@ export const PlayButton: React.FC<Props> = ({ item, url, ...props }) => {
                 CastContext.showPlayServicesErrorDialog(state);
               else {
                 // If we're opening a currently playing item, don't restart the media.
-                // Instead just open controls
-                console.log({ isOpeningCurrentlyPlayingMedia, currentlyPlaying })
+                // Instead just open controls.
                 if (isOpeningCurrentlyPlayingMedia) {
                   CastContext.showExpandedControls();
                   return;
@@ -91,14 +92,13 @@ export const PlayButton: React.FC<Props> = ({ item, url, ...props }) => {
                   },
                   startTime: 0,
                 }).then(() => {
+                  // state is already set when reopening current media, so skip it here.
                   if (isOpeningCurrentlyPlayingMedia) {
                     return
                   }
                   setCurrentlyPlayingState({ item, url });
                   CastContext.showExpandedControls();
-                }).catch(e => {
-                  console.log({ e })
-                });
+                })
               }
             });
             break;
diff --git a/plugins/withAndroidMainActivityAttributes.js b/plugins/withAndroidMainActivityAttributes.js
index d57b8c93..c5764408 100644
--- a/plugins/withAndroidMainActivityAttributes.js
+++ b/plugins/withAndroidMainActivityAttributes.js
@@ -39,4 +39,4 @@ module.exports = function withAndroidMainActivityAttributes(config, attributes)
     config.modResults = addAttributesToMainActivity(config.modResults, attributes);
     return config;
   });
-};
\ No newline at end of file
+};
diff --git a/providers/PlaybackProvider.tsx b/providers/PlaybackProvider.tsx
index 1c4f16ba..4cbe0f00 100644
--- a/providers/PlaybackProvider.tsx
+++ b/providers/PlaybackProvider.tsx
@@ -224,7 +224,9 @@ export const PlaybackProvider: React.FC<{ children: ReactNode }> = ({
   useEffect(() => {
     if (!deviceId || !api?.accessToken) return;
 
-    const url = `ws://${api?.basePath
+    const protocol = api?.basePath.includes('https') ? 'wss' : 'ws'
+
+    const url = `${protocol}://${api?.basePath
       .replace("https://", "")
       .replace("http://", "")}/socket?api_key=${
       api?.accessToken