diff --git a/Core/Console.cpp b/Core/Console.cpp
index f7ea22a..54648c5 100644
--- a/Core/Console.cpp
+++ b/Core/Console.cpp
@@ -69,6 +69,7 @@ void Console::Run()
 
 	uint32_t keyCode = KeyManager::GetKeyCode("Tab");
 
+	_videoDecoder->StartThread();
 	_emulationThreadId = std::this_thread::get_id();
 
 	auto lock = _runLock.AcquireSafe();
@@ -104,6 +105,8 @@ void Console::Stop()
 	_debugger.reset();
 	debugger.reset();
 
+	_videoDecoder->StopThread();
+
 	_cpu.reset();
 	_ppu.reset();
 	_spc.reset();