diff --git a/camera/EmulatedCamera.cpp b/camera/EmulatedCamera.cpp
index 8db9a7b..a57d6ac 100755
--- a/camera/EmulatedCamera.cpp
+++ b/camera/EmulatedCamera.cpp
@@ -603,7 +603,7 @@
     // Now that the parameters have been assigned check if the preview needs to
     // be restarted. If necessary this will then use the new parameters to set
     // up the preview as requested by the caller.
-    if (restartPreview) {
+    if (restartPreview && isPreviewEnabled()) {
         status_t status = doStopPreview();
         if (status != NO_ERROR) {
             ALOGE("%s: Stopping preview failed: %d", __FUNCTION__, status);