diff --git a/src/core/js/autocomplete.js b/src/core/js/autocomplete.js
index 542849c5e77f764717bad759ca6076550cd85b2f..345d06b37bc6456645ef02947c70b3f2f5d6c44f 100644
--- a/src/core/js/autocomplete.js
+++ b/src/core/js/autocomplete.js
@@ -101,6 +101,9 @@ var autocomplete = new function() {
 	};
 };
 
-//$(document).ready(function () {
-//   caosdb_modules.register(autocomplete);
-//});
+// this will be replaced by require.js in the future.
+$(document).ready(function() {
+    if ("${BUILD_MODULE_EXT_AUTOCOMPLETE}" === "ENABLED") {
+        caosdb_modules.register(autocomplete);
+    }
+});
diff --git a/src/core/js/ext_bottom_line.js b/src/core/js/ext_bottom_line.js
index 404648e5dc50b68861146ce10fc7bdcc3b13154d..25897319232c0401062c922bdddd6f01e7495efa 100644
--- a/src/core/js/ext_bottom_line.js
+++ b/src/core/js/ext_bottom_line.js
@@ -529,4 +529,4 @@ $(document).ready(function() {
         caosdb_modules.register(plotly_preview);
         caosdb_modules.register(ext_bottom_line);
     }
-});
\ No newline at end of file
+});