diff --git a/app/src/main/java/org/thoughtcrime/securesms/audio/MediaRecorderWrapper.java b/app/src/main/java/org/thoughtcrime/securesms/audio/MediaRecorderWrapper.java
index db468680b1..606aaeadb6 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/audio/MediaRecorderWrapper.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/audio/MediaRecorderWrapper.java
@@ -45,6 +45,10 @@ public class MediaRecorderWrapper implements Recorder {
 
   @Override
   public void stop() {
+    if (recorder == null) {
+      return;
+    }
+
     try {
       recorder.stop();
     } catch (RuntimeException e) {