diff --git a/Windows/MainWindow.cpp b/Windows/MainWindow.cpp
index f831a7af43..fa7d37113f 100644
--- a/Windows/MainWindow.cpp
+++ b/Windows/MainWindow.cpp
@@ -1097,15 +1097,6 @@ namespace MainWindow {
 			UpdateWindowTitle();
 			break;
 
-		case WM_USER_RESTART_EMUTHREAD:
-			NativeSetRestarting();
-			g_InputManager.StopPolling();
-			MainThread_Stop();
-			UpdateUIState(UISTATE_MENU);
-			MainThread_Start(0, nullptr);
-			g_InputManager.BeginPolling();
-			break;
-
 		case WM_USER_SWITCHUMD_UPDATED:
 			UpdateSwitchUMD();
 			break;
diff --git a/Windows/MainWindow.h b/Windows/MainWindow.h
index 3adfccecf3..d48b0a3724 100644
--- a/Windows/MainWindow.h
+++ b/Windows/MainWindow.h
@@ -17,7 +17,6 @@ namespace MainWindow
 		WM_USER_UPDATE_UI = WM_USER + 101,
 		WM_USER_WINDOW_TITLE_CHANGED = WM_USER + 103,
 		WM_USER_APPLY_FULLSCREEN = WM_USER + 105,
-		WM_USER_RESTART_EMUTHREAD = WM_USER + 106,
 		WM_USER_SWITCHUMD_UPDATED = WM_USER + 107,
 		WM_USER_RUN_CALLBACK = WM_USER + 108,
 		WM_USER_DESTROY = WM_USER + 109,
diff --git a/Windows/MainWindowMenu.cpp b/Windows/MainWindowMenu.cpp
index 9e8deff68a..b83a8184be 100644
--- a/Windows/MainWindowMenu.cpp
+++ b/Windows/MainWindowMenu.cpp
@@ -446,12 +446,8 @@ namespace MainWindow {
 	}
 
 	static void RestartApp() {
-		if (System_GetPropertyBool(SYSPROP_DEBUGGER_PRESENT)) {
-			PostMessage(MainWindow::GetHWND(), WM_USER_RESTART_EMUTHREAD, 0, 0);
-		} else {
-			g_Config.bRestartRequired = true;
-			PostMessage(MainWindow::GetHWND(), WM_USER_DESTROY, 0, 0);
-		}
+		g_Config.bRestartRequired = true;
+		PostMessage(MainWindow::GetHWND(), WM_USER_DESTROY, 0, 0);
 	}
 
 	void MainWindowMenu_Process(HWND hWnd, WPARAM wParam) {
diff --git a/Windows/main.cpp b/Windows/main.cpp
index b2fc64f2c7..8169216eff 100644
--- a/Windows/main.cpp
+++ b/Windows/main.cpp
@@ -658,14 +658,11 @@ bool System_MakeRequest(SystemRequestType type, int requestId, const std::string
 	case SystemRequestType::RESTART_APP:
 	{
 		g_restartArgs = param1;
-		if (!g_restartArgs.empty())
+		if (!g_restartArgs.empty()) {
 			AddDebugRestartArgs();
-		if (false) {  // This doesn't really work anymore: System_GetPropertyBool(SYSPROP_DEBUGGER_PRESENT)) {
-			PostMessage(MainWindow::GetHWND(), MainWindow::WM_USER_RESTART_EMUTHREAD, 0, 0);
-		} else {
-			g_Config.bRestartRequired = true;
-			PostMessage(MainWindow::GetHWND(), MainWindow::WM_USER_DESTROY, 0, 0);
 		}
+		g_Config.bRestartRequired = true;
+		PostMessage(MainWindow::GetHWND(), MainWindow::WM_USER_DESTROY, 0, 0);
 		return true;
 	}
 	case SystemRequestType::COPY_TO_CLIPBOARD: