diff --git a/app/src/main/java/org/linphone/assistant/QrCodeConfigurationAssistantActivity.java b/app/src/main/java/org/linphone/assistant/QrCodeConfigurationAssistantActivity.java
index 720f95b56..7d67f8e6d 100644
--- a/app/src/main/java/org/linphone/assistant/QrCodeConfigurationAssistantActivity.java
+++ b/app/src/main/java/org/linphone/assistant/QrCodeConfigurationAssistantActivity.java
@@ -79,7 +79,7 @@ public class QrCodeConfigurationAssistantActivity extends AssistantActivity {
     protected void onResume() {
         super.onResume();
 
-        launchQrcodeReader();
+        enableQrcodeReader(true);
     }
 
     @Override
@@ -93,6 +93,7 @@ public class QrCodeConfigurationAssistantActivity extends AssistantActivity {
         Core core = LinphoneManager.getCore();
         if (core == null) return;
 
+        core.setNativePreviewWindowId(enable ? mQrcodeView : null);
         core.enableQrcodeVideoPreview(enable);
         core.enableVideoPreview(enable);
 
@@ -122,12 +123,4 @@ public class QrCodeConfigurationAssistantActivity extends AssistantActivity {
         }
         core.setVideoDevice(newDevice);
     }
-
-    private void launchQrcodeReader() {
-        Core core = LinphoneManager.getCore();
-        if (core == null) return;
-
-        core.setNativePreviewWindowId(mQrcodeView);
-        enableQrcodeReader(true);
-    }
 }