diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
index 28e80ad..3f658da 100644
--- a/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
+++ b/app/src/main/java/net/schueller/peertube/activity/VideoPlayActivity.java
@@ -353,10 +353,16 @@ public class VideoPlayActivity extends AppCompatActivity {
     }
     @Override
     public void onPictureInPictureModeChanged (boolean isInPictureInPictureMode, Configuration newConfig) {
+        FragmentManager fragmentManager = getSupportFragmentManager();
+        VideoPlayerFragment videoPlayerFragment = (VideoPlayerFragment) fragmentManager.findFragmentById(R.id.video_player_fragment);
+
         if (isInPictureInPictureMode) {
             Log.v(TAG,"switched to pip ");
+            videoPlayerFragment.useController(false);
         } else {
             Log.v(TAG,"switched to normal");
+            videoPlayerFragment.useController(true);
         }
     }
+
 }
diff --git a/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java b/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
index a37af1c..f7cac8a 100644
--- a/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
+++ b/app/src/main/java/net/schueller/peertube/fragment/VideoPlayerFragment.java
@@ -199,7 +199,11 @@ public class VideoPlayerFragment extends Fragment implements VideoRendererEventL
             }
         });
     }
-
+    public void useController(boolean value){
+        if (mBound){
+            simpleExoPlayerView.setUseController(value);
+        }
+    }
     private void playVideo(Video video) {
 
         Context context = getContext();
diff --git a/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java b/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
index bb22505..e3fcb71 100644
--- a/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
+++ b/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java
@@ -130,8 +130,12 @@ public class VideoPlayerService extends Service {
             playerNotificationManager.setPlayer(null);
         }
         //Was seeing an error when exiting the program about about not unregistering the receiver.
-        if (null!=myNoisyAudioStreamReceiver) {
-            this.unregisterReceiver(myNoisyAudioStreamReceiver);
+        try {
+            if (null!=myNoisyAudioStreamReceiver) {
+                this.unregisterReceiver(myNoisyAudioStreamReceiver);
+            }
+        } catch (Exception e) {
+            Log.e("VideoPlayerService", "attempted to unregister a nonregistered service");
         }
         if (player != null) {
             player.release();