diff --git a/app/src/main/java/com/streamplayer/PlayerActivity.java b/app/src/main/java/com/streamplayer/PlayerActivity.java
index 50d822d..f9f14b0 100644
--- a/app/src/main/java/com/streamplayer/PlayerActivity.java
+++ b/app/src/main/java/com/streamplayer/PlayerActivity.java
@@ -223,6 +223,8 @@ public class PlayerActivity extends AppCompatActivity {
         super.onStart();
         if (player != null) {
             playerView.onResume();
+        } else if (channelUrl != null) {
+            loadChannel();
         }
     }
 
@@ -245,9 +247,7 @@ public class PlayerActivity extends AppCompatActivity {
     @Override
     protected void onStop() {
         super.onStop();
-        if (player != null) {
-            playerView.onPause();
-        }
+        releasePlayer();
     }
 
     @Override