diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f11b523cb90f1ca7ac96e4891d426d78d033d17..74d3746bad94bb5988121ad3555656e218353a4d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+* `query_form` module. Enable/disable via build property
+  `BUILD_MODULE_LEGACY_QUERY_FORM={ENABLED,DISABLED}`. To be removed when
+  caosdb-webui-core-components are included into this webui permanently.
+
 ### Removed
 
 ### Fixed
diff --git a/build.properties.d/00_default.properties b/build.properties.d/00_default.properties
index f188535c2e33448dc46297f2333050d2b480f96f..795a360792b1683b7f4ba8f6dfd6e7f3047590fc 100644
--- a/build.properties.d/00_default.properties
+++ b/build.properties.d/00_default.properties
@@ -54,7 +54,7 @@ BUILD_MODULE_EXT_ANNOTATION=ENABLED
 BUILD_MODULE_EXT_COSMETICS_LINKIFY=DISABLED
 BUILD_MODULE_EXT_QRCODE=ENABLED
 BUILD_MODULE_SHOW_ID_IN_LABEL=DISABLED
-BUILD_MODULE_LEGACY_QUERY_FORM=DISABLED
+BUILD_MODULE_LEGACY_QUERY_FORM=ENABLED
 
 BUILD_MODULE_USER_MANAGEMENT=ENABLED
 BUILD_MODULE_USER_MANAGEMENT_CHANGE_OWN_PASSWORD_REALM=CaosDB