diff --git a/plugins/GSdx/GSDevice11.cpp b/plugins/GSdx/GSDevice11.cpp
index dca96bfe34..196569e410 100644
--- a/plugins/GSdx/GSDevice11.cpp
+++ b/plugins/GSdx/GSDevice11.cpp
@@ -229,6 +229,9 @@ bool GSDevice11::Create(GSWnd* wnd)
 		}
 	}
 
+	if (m_msaa_desc.Count == 1)
+		m_msaa = 0;
+
 	// convert
 
 	D3D11_INPUT_ELEMENT_DESC il_convert[] =
diff --git a/plugins/GSdx/GSDevice9.cpp b/plugins/GSdx/GSDevice9.cpp
index 27a43e0a4e..1d80539f32 100644
--- a/plugins/GSdx/GSDevice9.cpp
+++ b/plugins/GSdx/GSDevice9.cpp
@@ -91,10 +91,10 @@ bool GSDevice9::Create(GSWnd* wnd)
 
 	if(!m_d3d) return false;
 
-	if (TestDepthFormat(m_d3d, D3DFMT_D32F_LOCKABLE))
-		m_depth_format = D3DFMT_D32F_LOCKABLE;
-	else if (TestDepthFormat(m_d3d, D3DFMT_D32))
+	if (TestDepthFormat(m_d3d, D3DFMT_D32))
 		m_depth_format = D3DFMT_D32;
+	else if (TestDepthFormat(m_d3d, D3DFMT_D32F_LOCKABLE))
+		m_depth_format = D3DFMT_D32F_LOCKABLE;
 	else if (TestDepthFormat(m_d3d, D3DFMT_D24S8))
 		m_depth_format = D3DFMT_D24S8;
 	else
@@ -155,6 +155,9 @@ bool GSDevice9::Create(GSWnd* wnd)
 		}
 	}
 
+	if (m_msaa_desc.Count == 1)
+		m_msaa = 0;
+
 	//
 
 	if(!Reset(1, 1))