diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
index 0530fa5b4..362540521 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/AccountSettingsViewModel.kt
@@ -43,7 +43,11 @@ class AccountSettingsViewModelFactory(private val identity: String) :
                 return AccountSettingsViewModel(account) as T
             }
         }
-        return AccountSettingsViewModel(coreContext.core.defaultAccount!!) as T
+        val defaultAccount = coreContext.core.defaultAccount
+        if (defaultAccount != null) {
+            return AccountSettingsViewModel(defaultAccount) as T
+        }
+        return coreContext.core.accountList.firstOrNull() as T
     }
 }
 
diff --git a/app/src/main/res/layout-sw533dp/dialer_fragment.xml b/app/src/main/res/layout-sw533dp/dialer_fragment.xml
index b26e4ba61..6ba47a5d8 100644
--- a/app/src/main/res/layout-sw533dp/dialer_fragment.xml
+++ b/app/src/main/res/layout-sw533dp/dialer_fragment.xml
@@ -30,7 +30,7 @@
             android:contentDescription="@null"
             android:src="@drawable/dialer_background" />
 
-        <TextureView
+        <org.linphone.mediastream.video.capture.CaptureTextureView
             android:id="@+id/video_preview_window"
             android:visibility="@{viewModel.showPreview ? View.VISIBLE : View.GONE, default=gone}"
             android:layout_width="match_parent"