diff --git a/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
index 885a3770e..e9d6a0866 100644
--- a/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/MediaPreviewActivity.java
@@ -674,7 +674,7 @@ public class MediaPreviewActivity extends PassphraseRequiredActionBarActivity
     public void onViewRecycled(@NonNull MediaViewHolder holder) {
       super.onViewRecycled(holder);
       int pos = holder.getBindingAdapterPosition();
-      if (pos != RecyclerView.NO_ID) {
+      if (pos != RecyclerView.NO_POSITION) {
         mediaViews.remove(pos);
       }
       holder.mediaView.cleanup();
diff --git a/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java b/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java
index 563a3a8fb..a8d0ff36c 100644
--- a/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java
+++ b/src/main/java/org/thoughtcrime/securesms/qr/QrActivity.java
@@ -230,7 +230,7 @@ public class QrActivity extends BaseActionBarActivity implements View.OnClickLis
 
   @Override
   public void onClick(View v) {
-    viewPager.setCurrentItem(TAB_SCAN);
+    viewPager.setCurrentItem(TAB_SCAN, true);
   }
 
   private class ProfilePagerAdapter extends FragmentStateAdapter {