diff --git a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
index 75a0c3e9d1..5c9b77b4cc 100644
--- a/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
+++ b/webrtc/api/java/android/org/webrtc/VideoCapturerAndroid.java
@@ -544,8 +544,6 @@ public class VideoCapturerAndroid implements
     final CountDownLatch barrier = new CountDownLatch(1);
     cameraThreadHandler.post(new Runnable() {
         @Override public void run() {
-          // Make sure onTextureFrameAvailable() is not called anymore.
-          surfaceHelper.stopListening();
           stopCaptureOnCameraThread();
           barrier.countDown();
         }
@@ -566,6 +564,8 @@ public class VideoCapturerAndroid implements
       return;
     }
 
+    // Make sure onTextureFrameAvailable() is not called anymore.
+    surfaceHelper.stopListening();
     cameraThreadHandler.removeCallbacks(cameraObserver);
     cameraStatistics.getAndResetFrameCount();
     Logging.d(TAG, "Stop preview.");