diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 5e37a3c3f6f30f0ea9247c7cb500e31f308d268a..26780542e9ede8db8a14077f109af256c1cb4028 100755
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -2175,8 +2175,7 @@ public class CaptureModule implements CameraModule, PhotoController,
                 } else {
                     int preivewFPS = mSettingsManager.getVideoPreviewFPS(mVideoSize,
                             mSettingsManager.getVideoFPS());
-                    if(mSettingsManager.getVideoFPS() == NORMAL_SESSION_MAX_FPS
-                            && preivewFPS == 30){
+                    if(preivewFPS == 30) {
                         mVideoRecordRequestBuilder.addTarget(mMediaRecorderSurface);
                     }
                     configureCameraSessionWithParameters(cameraId, surfaces,
@@ -5821,17 +5820,14 @@ public class CaptureModule implements CameraModule, PhotoController,
                 mUI.clearFocus();
             }
             mUI.hideUIwhileRecording();
-            if (isHighSpeedRateCapture()) {
-                List<CaptureRequest> slowMoRequests  = mSuperSlomoCapture ?
-                        createSSMBatchRequest(mVideoRecordRequestBuilder) :
-                        ((CameraConstrainedHighSpeedCaptureSession) mCurrentSession).
-                                createHighSpeedRequestList(mVideoRecordRequestBuilder.build());
-                mCurrentSession.setRepeatingBurst(slowMoRequests, mCaptureCallback,
-                        mCameraHandler);
-            } else {
-                mVideoRecordRequestBuilder.addTarget(mMediaRecorderSurface);
-                mCurrentSession.setRepeatingRequest(mVideoRecordRequestBuilder.build(),
-                        mCaptureCallback, mCameraHandler);
+            if (!isHighSpeedRateCapture()) {
+                int preivewFPS = mSettingsManager.getVideoPreviewFPS(mVideoSize,
+                        mSettingsManager.getVideoFPS());
+                if (preivewFPS != 30) {
+                    mVideoRecordRequestBuilder.addTarget(mMediaRecorderSurface);
+                    mCurrentSession.setRepeatingRequest(mVideoRecordRequestBuilder.build(),
+                            mCaptureCallback, mCameraHandler);
+                }
             }
             mCameraHandler.removeMessages(CANCEL_TOUCH_FOCUS, mCameraId[cameraId]);
             if (!mFrameProcessor.isFrameListnerEnabled() && !startMediaRecorder() ||