diff --git a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtCameraListener.java b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtCameraListener.java
index 008458e893d21a881bfc6cc5ea8932766d7174bf..8a2697afe12c117c88789c55cc3cd6c0c75955a4 100644
--- a/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtCameraListener.java
+++ b/src/plugins/android/jar/src/org/qtproject/qt5/android/multimedia/QtCameraListener.java
@@ -104,11 +104,16 @@ public class QtCameraListener implements Camera.ShutterCallback,
         return m_previewBytesPerLine;
     }
 
+    public void clearPreviewCallback(Camera camera)
+    {
+        camera.setPreviewCallbackWithBuffer(null);
+    }
+
     public void setupPreviewCallback(Camera camera)
     {
         // Clear previous callback (also clears added buffers)
+        clearPreviewCallback(camera);
         m_lastPreviewBuffer = null;
-        camera.setPreviewCallbackWithBuffer(null);
 
         final Camera.Parameters params = camera.getParameters();
         m_previewSize = params.getPreviewSize();
diff --git a/src/plugins/android/src/wrappers/jni/androidcamera.cpp b/src/plugins/android/src/wrappers/jni/androidcamera.cpp
index 0ce8eff39b9002c4fe0cb3b56b596965f20ed0ed..b0e02b7c27b6c76eb3b87e4c2f75afcc25115008 100644
--- a/src/plugins/android/src/wrappers/jni/androidcamera.cpp
+++ b/src/plugins/android/src/wrappers/jni/androidcamera.cpp
@@ -1436,6 +1436,11 @@ void AndroidCameraPrivate::takePicture()
 {
     QJNIEnvironmentPrivate env;
 
+    // We must clear the preview callback before calling takePicture(), otherwise the call will
+    // block and the camera server will be frozen until the next device restart...
+    // That problem only happens on some devices and on the emulator
+    m_cameraListener.callMethod<void>("clearPreviewCallback", "(Landroid/hardware/Camera;)V", m_camera.object());
+
     m_camera.callMethod<void>("takePicture", "(Landroid/hardware/Camera$ShutterCallback;"
                                              "Landroid/hardware/Camera$PictureCallback;"
                                              "Landroid/hardware/Camera$PictureCallback;)V",