diff --git a/include/wx/chkconf.h b/include/wx/chkconf.h
index 13b3f70d4a..46ba51d014 100644
--- a/include/wx/chkconf.h
+++ b/include/wx/chkconf.h
@@ -870,7 +870,9 @@
 #   endif
 #endif /* wxUSE_UNICODE_MSLU */
 
-#if wxUSE_ODBC && wxUSE_UNICODE
+/* ODBC and Unicode are now compatible */
+
+#if 0 // wxUSE_ODBC && wxUSE_UNICODE
 #   ifdef wxABORT_ON_CONFIG_ERROR
         /* (ODBC classes aren't Unicode-compatible yet) */
 #       error "wxUSE_ODBC can't be used with wxUSE_UNICODE"