diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 6ff0f1b14..9497abd2b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -39,9 +39,7 @@
             </intent-filter>
         </activity-alias>
 
-        <activity
-            android:name=".LegacyActivity"
-            android:noHistory="true" />
+        <activity android:name=".LegacyActivity" />
 
         <service
             android:name="com.glia.androidsdk.fcm.GliaFcmService"
diff --git a/app/src/main/java/com/glia/exampleapp/MainFragment.kt b/app/src/main/java/com/glia/exampleapp/MainFragment.kt
index 5fe2c6d13..01f107bdc 100644
--- a/app/src/main/java/com/glia/exampleapp/MainFragment.kt
+++ b/app/src/main/java/com/glia/exampleapp/MainFragment.kt
@@ -157,7 +157,7 @@ class MainFragment : Fragment() {
     }
 
     private fun onEngagementStarted() {
-        requireView().post {
+        view?.post {
             ongoingEngagementItem.isVisible = true
             engagementEndedItem.isVisible = false
             pauseItem.isVisible = true
@@ -166,7 +166,7 @@ class MainFragment : Fragment() {
     }
 
     private fun onEngagementEnded() {
-        requireView().post {
+        view?.post {
             ongoingEngagementItem.isVisible = false
             engagementEndedItem.isVisible = true
             pauseItem.isVisible = false
@@ -456,7 +456,7 @@ class MainFragment : Fragment() {
         prepareAuthentication()
         listenForCallVisualizerEngagements()
 
-        requireView().post {
+        view?.post {
             initMenu()
         }
     }