diff --git a/plugins/GSdx/GSClut.cpp b/plugins/GSdx/GSClut.cpp
index f9e1f516b7..013e0a271e 100644
--- a/plugins/GSdx/GSClut.cpp
+++ b/plugins/GSdx/GSClut.cpp
@@ -115,8 +115,16 @@ bool GSClut::WriteTest(const GIFRegTEX0& TEX0, const GIFRegTEXCLUT& TEXCLUT)
 	case 3: m_CBP[1] = TEX0.CBP; break;
 	case 4: if(m_CBP[0] == TEX0.CBP) return false; m_CBP[0] = TEX0.CBP; break;
 	case 5: if(m_CBP[1] == TEX0.CBP) return false; m_CBP[1] = TEX0.CBP; break;
-	case 6: ASSERT(0); return false; // ffx2 menu
-	case 7: ASSERT(0); return false; // ford mustang racing // Bouken Jidai Katsugeki Goemon
+	case 6:
+#ifndef DISABLE_WIP_ASSERTION
+			ASSERT(0);
+#endif
+			return false; // ffx2 menu
+	case 7:
+#ifndef DISABLE_WIP_ASSERTION
+			ASSERT(0);
+#endif
+			return false; // ford mustang racing // Bouken Jidai Katsugeki Goemon
 	default: __assume(0);
 	}