diff --git a/intern/opensubdiv/opensubdiv_intern.h b/intern/opensubdiv/opensubdiv_intern.h
index 3e3925e74c4..ccb32f9d0ac 100644
--- a/intern/opensubdiv/opensubdiv_intern.h
+++ b/intern/opensubdiv/opensubdiv_intern.h
@@ -30,7 +30,10 @@
 #ifdef NDEBUG
 #  undef OPENSUBDIV_VALIDATE_TOPOLOGY
 #else
-#  define OPENSUBDIV_VALIDATE_TOPOLOGY
+/* TODO(sergey): Always disabled for now, the check doesn't handle
+ * multiple non-manifolds from the OpenSubdiv side currently.
+ */
+#  undef OPENSUBDIV_VALIDATE_TOPOLOGY
 #endif
 
 /* Currently OpenSubdiv expects topology to be oriented,