diff --git a/Source/Core/Common/Src/Thread.cpp b/Source/Core/Common/Src/Thread.cpp
index 57196c837b..b7d185284d 100644
--- a/Source/Core/Common/Src/Thread.cpp
+++ b/Source/Core/Common/Src/Thread.cpp
@@ -91,7 +91,7 @@ void Thread::WaitForDeath()
 {
 	if (m_hThread)
 	{
-		WaitForSingleObject(m_hThread, THREAD_WAIT_TIMEOUT);
+		WaitForSingleObject(m_hThread, INFINITE);
 		CloseHandle(m_hThread);
 		m_hThread = NULL;
 	}
@@ -140,7 +140,7 @@ void Event::Set()
 
 void Event::Wait()
 {
-	WaitForSingleObject(m_hEvent, THREAD_WAIT_TIMEOUT);
+	WaitForSingleObject(m_hEvent, INFINITE);
 }
 
 inline HRESULT MsgWaitForSingleObject(HANDLE handle, DWORD timeout)
diff --git a/Source/Core/Common/Src/Thread.h b/Source/Core/Common/Src/Thread.h
index 722cdf22f7..820eef78fe 100644
--- a/Source/Core/Common/Src/Thread.h
+++ b/Source/Core/Common/Src/Thread.h
@@ -81,7 +81,6 @@ private:
 #ifdef _WIN32
 	HANDLE m_hThread;
 	DWORD m_threadId;
-	static const int THREAD_WAIT_TIMEOUT = 5000;
 #else
 	pthread_t thread_id;
 #endif