diff --git a/src/video_core/host1x/codecs/decoder.cpp b/src/video_core/host1x/codecs/decoder.cpp
index 49a601969c..877219ec44 100755
--- a/src/video_core/host1x/codecs/decoder.cpp
+++ b/src/video_core/host1x/codecs/decoder.cpp
@@ -41,7 +41,7 @@ void Decoder::Decode() {
 
         if (!frame.get()) {
             LOG_ERROR(HW_GPU,
-                      "Nvdec {} dailed to decode interlaced frame for top 0x{:X} bottom 0x{:X}", id,
+                      "Nvdec {} failed to decode interlaced frame for top 0x{:X} bottom 0x{:X}", id,
                       luma_top, luma_bottom);
         }
 
diff --git a/src/video_core/host1x/ffmpeg/ffmpeg.cpp b/src/video_core/host1x/ffmpeg/ffmpeg.cpp
index d4db78c393..118c0d2eea 100644
--- a/src/video_core/host1x/ffmpeg/ffmpeg.cpp
+++ b/src/video_core/host1x/ffmpeg/ffmpeg.cpp
@@ -282,10 +282,10 @@ bool DecodeApi::Initialize(Tegra::Host1x::NvdecCommon::VideoCodec codec) {
 	m_decoder_context.emplace(*m_decoder);
 
 	// Enable GPU decoding if requested.
-	//if (Settings::values.nvdec_emulation.GetValue() == Settings::NvdecEmulation::Gpu) {
+	if (Settings::values.nvdec_emulation.GetValue() == Settings::NvdecEmulation::Gpu) {
 		m_hardware_context.emplace();
 		m_hardware_context->InitializeForDecoder(*m_decoder_context, *m_decoder);
-	//}
+	}
 
 	// Open the decoder context.
 	if (!m_decoder_context->OpenContext(*m_decoder)) {
diff --git a/src/video_core/host1x/nvdec.h b/src/video_core/host1x/nvdec.h
index 565c65f663..3f25a2c59b 100644
--- a/src/video_core/host1x/nvdec.h
+++ b/src/video_core/host1x/nvdec.h
@@ -45,7 +45,7 @@ private:
 
     NvdecCommon::NvdecRegisters regs{};
     std::unique_ptr<Decoder> decoder;
-    bool wait_needed{false};
+    bool wait_needed{true};
 };
 
 } // namespace Host1x