diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 773b96400..3cc12c3aa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -167,7 +167,6 @@
         <receiver android:name=".core.BootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
-                <action android:name="android.intent.action.ACTION_SHUTDOWN" />
             </intent-filter>
         </receiver>
 
diff --git a/app/src/main/java/org/linphone/core/BootReceiver.kt b/app/src/main/java/org/linphone/core/BootReceiver.kt
index 34c09968c..f8762f0d6 100644
--- a/app/src/main/java/org/linphone/core/BootReceiver.kt
+++ b/app/src/main/java/org/linphone/core/BootReceiver.kt
@@ -24,22 +24,15 @@ import android.content.Context
 import android.content.Intent
 import androidx.core.content.ContextCompat
 import org.linphone.LinphoneApplication.Companion.corePreferences
-import org.linphone.R
 import org.linphone.core.tools.Log
 
 class BootReceiver : BroadcastReceiver() {
     override fun onReceive(context: Context, intent: Intent) {
-        val serviceIntent = Intent(Intent.ACTION_MAIN).setClass(context, CoreService::class.java)
-        if (intent.action.equals(Intent.ACTION_SHUTDOWN, ignoreCase = true)) {
-            android.util.Log.d(
-                context.getString(R.string.app_name),
-                "[Boot Receiver] Device is shutting down, destroying Core to unregister"
-            )
-            context.stopService(serviceIntent)
-        } else if (intent.action.equals(Intent.ACTION_BOOT_COMPLETED, ignoreCase = true)) {
+        if (intent.action.equals(Intent.ACTION_BOOT_COMPLETED, ignoreCase = true)) {
             val autoStart = corePreferences.autoStart
             Log.i("[Boot Receiver] Device is starting, autoStart is $autoStart")
             if (autoStart) {
+                val serviceIntent = Intent(Intent.ACTION_MAIN).setClass(context, CoreService::class.java)
                 serviceIntent.putExtra("StartForeground", true)
                 ContextCompat.startForegroundService(context, serviceIntent)
             }
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index e3c03c288..daade2f43 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -430,8 +430,13 @@ class CoreContext(val context: Context, coreConfig: Config) {
 
         if (overlayY == 0f) overlayY = AppUtils.pixelsToDp(40f)
         val windowManager = context.getSystemService(Context.WINDOW_SERVICE) as WindowManager
-        val params: WindowManager.LayoutParams = WindowManager.LayoutParams(WindowManager.LayoutParams.WRAP_CONTENT, WindowManager.LayoutParams.WRAP_CONTENT,
-            Compatibility.getOverlayType(), WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE, PixelFormat.TRANSLUCENT)
+        val params: WindowManager.LayoutParams = WindowManager.LayoutParams(
+            WindowManager.LayoutParams.WRAP_CONTENT,
+            WindowManager.LayoutParams.WRAP_CONTENT,
+            Compatibility.getOverlayType(),
+            WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE,
+            PixelFormat.TRANSLUCENT
+        )
         params.x = overlayX.toInt()
         params.y = overlayY.toInt()
         params.gravity = Gravity.TOP or Gravity.CENTER_HORIZONTAL