diff --git a/picture_in_picture/app/src/main/java/com/firework/example/pictureinpicture/MainActivity.kt b/picture_in_picture/app/src/main/java/com/firework/example/pictureinpicture/MainActivity.kt
index 1d01ce4..8a2840d 100644
--- a/picture_in_picture/app/src/main/java/com/firework/example/pictureinpicture/MainActivity.kt
+++ b/picture_in_picture/app/src/main/java/com/firework/example/pictureinpicture/MainActivity.kt
@@ -89,7 +89,19 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    override fun onStop() {
+        Log.i(TAG, "onStop - isFinishing: $isFinishing")
+        if (binding.closePipOnStop.isChecked && isFinishing) {
+            FireworkSdk.closePip()
+        }
+        super.onStop()
+    }
+
     override fun onDestroy() {
+        Log.i(TAG, "onDestroy")
+        if (binding.closePipOnDestroy.isChecked) {
+            FireworkSdk.closePip()
+        }
         binding.fwVideoFeedView.destroy()
         super.onDestroy()
     }
diff --git a/picture_in_picture/app/src/main/res/layout/activity_main.xml b/picture_in_picture/app/src/main/res/layout/activity_main.xml
index c9d9e8e..dfd1dde 100644
--- a/picture_in_picture/app/src/main/res/layout/activity_main.xml
+++ b/picture_in_picture/app/src/main/res/layout/activity_main.xml
@@ -26,15 +26,31 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/close_pip_mode"
-        app:layout_constraintBottom_toTopOf="@id/details"
+        app:layout_constraintBottom_toTopOf="@id/closePipOnStop"
         app:layout_constraintTop_toBottomOf="@id/enterPip" />
 
+    <CheckBox
+        android:id="@+id/closePipOnStop"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/close_pip_on_stop"
+        app:layout_constraintBottom_toTopOf="@id/closePipOnDestroy"
+        app:layout_constraintTop_toBottomOf="@id/closePip" />
+
+    <CheckBox
+        android:id="@+id/closePipOnDestroy"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/close_pip_on_destroy"
+        app:layout_constraintBottom_toTopOf="@id/details"
+        app:layout_constraintTop_toBottomOf="@id/closePipOnStop" />
+
     <include
         android:id="@+id/details"
         layout="@layout/details"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/closePip" />
+        app:layout_constraintTop_toBottomOf="@id/closePipOnDestroy" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/picture_in_picture/app/src/main/res/values/strings.xml b/picture_in_picture/app/src/main/res/values/strings.xml
index 0287828..0ff7010 100644
--- a/picture_in_picture/app/src/main/res/values/strings.xml
+++ b/picture_in_picture/app/src/main/res/values/strings.xml
@@ -7,4 +7,6 @@
 
     <string name="enter_pip_mode">Enter PiP mode in 5 sec</string>
     <string name="close_pip_mode">Close PiP mode</string>
+    <string name="close_pip_on_stop">Close PiP mode onStop</string>
+    <string name="close_pip_on_destroy">Close PiP mode onDestroy</string>
 </resources>