diff --git a/src/modules/video_coding/main/source/generic_encoder.cc b/src/modules/video_coding/main/source/generic_encoder.cc
index 3a6a831894..1c58d9e26a 100644
--- a/src/modules/video_coding/main/source/generic_encoder.cc
+++ b/src/modules/video_coding/main/source/generic_encoder.cc
@@ -200,10 +200,12 @@ VCMEncodedFrameCallback::Encoded(
     {
         encodedBytes = encodedImage._length;
 
+#ifdef DEBUG_ENCODER_BIT_STREAM
         if (_bitStreamAfterEncoder != NULL)
         {
             fwrite(encodedImage._buffer, 1, encodedImage._length, _bitStreamAfterEncoder);
         }
+#endif
 
         RTPVideoHeader rtpVideoHeader;
         RTPVideoHeader* rtpVideoHeaderPtr = &rtpVideoHeader;
diff --git a/src/modules/video_coding/main/source/video_coding_impl.cc b/src/modules/video_coding/main/source/video_coding_impl.cc
index 2de7e59d1f..fb8184c16f 100644
--- a/src/modules/video_coding/main/source/video_coding_impl.cc
+++ b/src/modules/video_coding/main/source/video_coding_impl.cc
@@ -821,11 +821,13 @@ VideoCodingModuleImpl::AddVideoFrame(const VideoFrame& videoFrame,
         WebRtc_Word32 ret = _encoder->Encode(videoFrame,
                                              codecSpecificInfo,
                                              _nextFrameType);
+#ifdef DEBUG_ENCODER_INPUT
         if (_encoderInputFile != NULL)
         {
             fwrite(videoFrame.Buffer(), 1, videoFrame.Length(),
                    _encoderInputFile);
         }
+#endif
         if (ret < 0)
         {
             WEBRTC_TRACE(webrtc::kTraceError,
@@ -1081,12 +1083,14 @@ VideoCodingModuleImpl::Decode(WebRtc_UWord16 maxWaitTimeMs)
         _timing.UpdateCurrentDelay(frame->RenderTimeMs(),
                                    VCMTickTime::MillisecondTimestamp());
 
+#ifdef DEBUG_DECODER_BIT_STREAM
         if (_bitStreamBeforeDecoder != NULL)
         {
             // Write bit stream to file for debugging purposes
             fwrite(frame->Buffer(), 1, frame->Length(),
                    _bitStreamBeforeDecoder);
         }
+#endif
         if (_frameStorageCallback != NULL)
         {
             WebRtc_Word32 ret = frame->Store(*_frameStorageCallback);