diff --git a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
index 9e44bf7ed8..1afc6f196c 100644
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
@@ -439,7 +439,9 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
 
   @Override
   public void onRequestFullScreen(boolean fullScreen) {
-    captionAndRail.setVisibility(fullScreen ? View.GONE : View.VISIBLE);
+    if (captionAndRail != null) {
+      captionAndRail.setVisibility(fullScreen ? View.GONE : View.VISIBLE);
+    }
   }
 
   @Override