diff --git a/app/src/main/java/com/cappielloantonio/play/service/MediaService.kt b/app/src/main/java/com/cappielloantonio/play/service/MediaService.kt
index 437f9891..216f4851 100644
--- a/app/src/main/java/com/cappielloantonio/play/service/MediaService.kt
+++ b/app/src/main/java/com/cappielloantonio/play/service/MediaService.kt
@@ -207,7 +207,7 @@ class MediaService : MediaLibraryService(), SessionAvailabilityListener {
 
     private fun initializeCastPlayer() {
         if (UIUtil.isCastApiAvailable(this)) {
-            castPlayer = CastPlayer(CastContext.getSharedInstance(this))
+            castPlayer = CastContext.getSharedInstance()?.let { CastPlayer(it) }!!
             castPlayer.setSessionAvailabilityListener(this)
         }
     }
diff --git a/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java b/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java
index 67d1e6e8..7881e0cf 100644
--- a/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java
+++ b/app/src/main/java/com/cappielloantonio/play/ui/activity/base/BaseActivity.java
@@ -103,7 +103,7 @@ public class BaseActivity extends AppCompatActivity {
     }
 
     private void initializeCastContext() {
-        if (UIUtil.isCastApiAvailable(this)) CastContext.getSharedInstance(this);
+        if (UIUtil.isCastApiAvailable(this)) CastContext.getSharedInstance();
     }
 
     private void setNavigationBarColor() {