diff --git a/plugins/GSdx/GSRendererSW.cpp b/plugins/GSdx/GSRendererSW.cpp
index b7a86df88f..9c96b3cf0e 100644
--- a/plugins/GSdx/GSRendererSW.cpp
+++ b/plugins/GSdx/GSRendererSW.cpp
@@ -72,6 +72,11 @@ GSRendererSW::GSRendererSW(int threads)
 	InitCVB(GS_SPRITE_CLASS);
 
 	m_dump_root = root_sw;
+
+	// Reset handler with the auto flush hack enabled on the SW renderer
+	// Impact on perf is rather small, and it avoids an extra hack option.
+	m_userhacks_auto_flush = true;
+	ResetHandlers();
 }
 
 GSRendererSW::~GSRendererSW()