diff --git a/Source/Core/DolphinWX/Src/X11Utils.cpp b/Source/Core/DolphinWX/Src/X11Utils.cpp
index 6c4282cceb..9be4d23fbf 100644
--- a/Source/Core/DolphinWX/Src/X11Utils.cpp
+++ b/Source/Core/DolphinWX/Src/X11Utils.cpp
@@ -200,6 +200,9 @@ XRRConfiguration::~XRRConfiguration()
 
 void XRRConfiguration::Update()
 {
+	if(SConfig::GetInstance().m_LocalCoreStartupParameter.strFullscreenResolution == "Auto")
+		return;
+	
 	if (!bValid)
 		return;