diff --git a/Core/Config.cpp b/Core/Config.cpp
index 51b232e0eb..b458914d10 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -380,6 +380,7 @@ static ConfigSetting generalSettings[] = {
 	ConfigSetting("RemoteISOManualConfig", &g_Config.bRemoteISOManual, false),
 	ConfigSetting("RemoteShareOnStartup", &g_Config.bRemoteShareOnStartup, false),
 	ConfigSetting("RemoteISOSubdir", &g_Config.sRemoteISOSubdir, "/"),
+	ConfigSetting("RemoteDebuggerOnStartup", &g_Config.bRemoteDebuggerOnStartup, false),
 
 #ifdef __ANDROID__
 	ConfigSetting("ScreenRotation", &g_Config.iScreenRotation, 1),
diff --git a/Core/Config.h b/Core/Config.h
index 05a4824203..e423013842 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -141,6 +141,7 @@ public:
 	bool bRemoteISOManual;
 	bool bRemoteShareOnStartup;
 	std::string sRemoteISOSubdir;
+	bool bRemoteDebuggerOnStartup;
 	bool bMemStickInserted;
 
 	int iScreenRotation;  // The rotation angle of the PPSSPP UI. Only supported on Android and possibly other mobile platforms.
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index 8ae0bedb41..5e8b8deaf0 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -587,10 +587,12 @@ void NativeInit(int argc, const char *argv[], const char *savegame_dir, const ch
 		screenManager->switchScreen(new LogoScreen());
 	}
 
-	if (g_Config.bRemoteShareOnStartup) {
-		// TODO: Separate config options.
+	if (g_Config.bRemoteShareOnStartup && g_Config.bRemoteDebuggerOnStartup)
 		StartWebServer(WebServerFlags::ALL);
-	}
+	else if (g_Config.bRemoteShareOnStartup)
+		StartWebServer(WebServerFlags::DISCS);
+	else if (g_Config.bRemoteDebuggerOnStartup)
+		StartWebServer(WebServerFlags::DEBUGGER);
 
 	std::string sysName = System_GetProperty(SYSPROP_NAME);
 	isOuya = KeyMap::IsOuya(sysName);