diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardActivity.java
index 08f6e4e61..91770a459 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardActivity.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardActivity.java
@@ -129,6 +129,7 @@ public class OwnerReturnShardActivity extends BaseActivity
 	}
 
 	private void showQrCodeFragment() {
+		LOG.info("showQrCodeFragment called");
 		FragmentManager fm = getSupportFragmentManager();
 		if (fm.findFragmentByTag(OwnerReturnShardFragment.TAG) == null) {
 			BaseFragment f = OwnerReturnShardFragment.newInstance();
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java
index 978eb949b..686f14cf7 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardFragment.java
@@ -7,14 +7,11 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault;
 import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault;
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
-import org.briarproject.briar.android.contact.add.nearby.CameraException;
-import org.briarproject.briar.android.contact.add.nearby.CameraView;
 import org.briarproject.briar.android.fragment.BaseFragment;
 import org.briarproject.briar.android.view.QrCodeView;
 import org.briarproject.briar.api.socialbackup.recovery.SecretOwnerTask;
@@ -86,6 +83,10 @@ public class OwnerReturnShardFragment extends BaseFragment
 
 		viewModel.getState().observe(getViewLifecycleOwner(),
 				this::onReturnShardStateChanged);
+		Bitmap qrCodeBitmap = viewModel.getQrCodeBitmap();
+		if (qrCodeBitmap != null) {
+			qrCodeView.setQrCode(qrCodeBitmap);
+		}
 	}
 
 	@Override
@@ -107,15 +108,21 @@ public class OwnerReturnShardFragment extends BaseFragment
 		if (fullscreen) {
 			// Grow the QR code view to fill its parent
 			statusParams = new LinearLayout.LayoutParams(0, 0, 0f);
-			qrCodeParams = new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT, 1f);
+			qrCodeParams =
+					new LinearLayout.LayoutParams(MATCH_PARENT, MATCH_PARENT,
+							1f);
 		} else {
 			// Shrink the QR code view to fill half its parent
 			if (cameraOverlay.getOrientation() == HORIZONTAL) {
-				statusParams = new LinearLayout.LayoutParams(0, MATCH_PARENT, 1f);
-				qrCodeParams = new LinearLayout.LayoutParams(0, MATCH_PARENT, 1f);
+				statusParams =
+						new LinearLayout.LayoutParams(0, MATCH_PARENT, 1f);
+				qrCodeParams =
+						new LinearLayout.LayoutParams(0, MATCH_PARENT, 1f);
 			} else {
-				statusParams = new LinearLayout.LayoutParams(MATCH_PARENT, 0, 1f);
-				qrCodeParams = new LinearLayout.LayoutParams(MATCH_PARENT, 0, 1f);
+				statusParams =
+						new LinearLayout.LayoutParams(MATCH_PARENT, 0, 1f);
+				qrCodeParams =
+						new LinearLayout.LayoutParams(MATCH_PARENT, 0, 1f);
 			}
 		}
 		statusView.setLayoutParams(statusParams);
@@ -124,7 +131,8 @@ public class OwnerReturnShardFragment extends BaseFragment
 	}
 
 	@UiThread
-	private void onReturnShardStateChanged(@Nullable SecretOwnerTask.State state) {
+	private void onReturnShardStateChanged(
+			@Nullable SecretOwnerTask.State state) {
 		if (state instanceof SecretOwnerTask.State.Listening) {
 			Bitmap qrCode = viewModel.getQrCodeBitmap();
 			qrCodeView.setQrCode(qrCode);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardViewModel.java b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardViewModel.java
index c77ec478c..9997f35c6 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardViewModel.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/socialbackup/recover/OwnerReturnShardViewModel.java
@@ -60,6 +60,7 @@ class OwnerReturnShardViewModel extends AndroidViewModel implements SecretOwnerT
 		this.ioExecutor = ioExecutor;
 		this.task = task;
 //		IntentFilter filter = new IntentFilter(ACTION_SCAN_MODE_CHANGED);
+		startListening();
 	}
 
 	@Override
@@ -81,7 +82,7 @@ class OwnerReturnShardViewModel extends AndroidViewModel implements SecretOwnerT
 		wasContinueClicked = false;
 		// If we return to the intro fragment, we may need to enable wifi and
 //		hasEnabledWifi = false;
-		startListening();
+		showQrCodeFragment.setEvent(true);
 	}
 
 	@UiThread
@@ -208,6 +209,7 @@ class OwnerReturnShardViewModel extends AndroidViewModel implements SecretOwnerT
 	}
 
 	public Bitmap getQrCodeBitmap() {
+		LOG.info("getting qrCodeBitmap");
 		return qrCodeBitmap;
 	}
 
@@ -225,7 +227,6 @@ class OwnerReturnShardViewModel extends AndroidViewModel implements SecretOwnerT
 		       String content = new String(payloadBytes, ISO_8859_1);
 		       qrCodeBitmap = QrCodeUtils.createQrCode(dm, content);
 	       });
-	       showQrCodeFragment.setEvent(true);
        }
 	}
 }