diff --git a/components/codecs/src/nvidia_encoder.cpp b/components/codecs/src/nvidia_encoder.cpp
index fd4d771d257bfe06ce039a8857683ec66ba68d9a..65b9ec32013b58fe9267aaf00151e6f3e0dc5082 100644
--- a/components/codecs/src/nvidia_encoder.cpp
+++ b/components/codecs/src/nvidia_encoder.cpp
@@ -196,7 +196,7 @@ bool NvidiaEncoder::encode(const cv::cuda::GpuMat &in, ftl::codecs::Packet &pkt)
 	pkt.data.resize(ftl::codecs::kVideoBufferSize);
 
 	// Make sure conversions complete...
-	//stream_.waitForCompletion();
+	stream_.waitForCompletion();
 
 	// Insert periodic i-frames here.
 	if (((++frame_count_) % 128) == 0) {
@@ -300,7 +300,6 @@ bool NvidiaEncoder::_createEncoder(const cv::cuda::GpuMat &in, const ftl::codecs
 		}
 
 		nvenc_->CreateEncoder(&initializeParams);
-		nvenc_->SetIOCudaStreams(cv::cuda::StreamAccessor::getStream(stream_), 0);
 	}
 	catch (NVENCException& e)
 	{