diff --git a/ee/api/.gitignore b/ee/api/.gitignore
index 17a1f985b..abfaa08d2 100644
--- a/ee/api/.gitignore
+++ b/ee/api/.gitignore
@@ -182,6 +182,7 @@ Pipfile
 /chalicelib/core/announcements.py
 /chalicelib/core/autocomplete.py
 /chalicelib/core/collaboration_slack.py
+/chalicelib/core/errors.py
 /chalicelib/core/errors_favorite_viewed.py
 /chalicelib/core/events.py
 /chalicelib/core/events_ios.py
diff --git a/ee/api/chalicelib/core/__init__.py b/ee/api/chalicelib/core/__init__.py
index 81531632c..508ee141f 100644
--- a/ee/api/chalicelib/core/__init__.py
+++ b/ee/api/chalicelib/core/__init__.py
@@ -4,6 +4,8 @@ if config("LEGACY_SEARCH", cast=bool, default=False):
     print(">>> Using legacy search")
     from . import autocomplete as autocomplete
     from . import sessions as sessions
+    from . import errors as errors
 else:
     from . import autocomplete_ee as autocomplete
     from . import sessions_ee as sessions
+    from . import errors_ee as errors
diff --git a/ee/api/chalicelib/core/errors.py b/ee/api/chalicelib/core/errors_ee.py
similarity index 100%
rename from ee/api/chalicelib/core/errors.py
rename to ee/api/chalicelib/core/errors_ee.py
diff --git a/ee/api/clean.sh b/ee/api/clean.sh
index b9124f1f5..7ea569352 100755
--- a/ee/api/clean.sh
+++ b/ee/api/clean.sh
@@ -5,6 +5,7 @@ rm -rf ./chalicelib/core/alerts_processor.py
 rm -rf ./chalicelib/core/announcements.py
 rm -rf ./chalicelib/core/autocomplete.py
 rm -rf ./chalicelib/core/collaboration_slack.py
+rm -rf ./chalicelib/core/errors.py
 rm -rf ./chalicelib/core/errors_favorite_viewed.py
 rm -rf ./chalicelib/core/events.py
 rm -rf ./chalicelib/core/events_ios.py
diff --git a/ee/scripts/helm/db/init_dbs/clickhouse/1.8.0/1.8.0.sql b/ee/scripts/helm/db/init_dbs/clickhouse/1.8.0/1.8.0.sql
index f83dbf70a..0c684a7f8 100644
--- a/ee/scripts/helm/db/init_dbs/clickhouse/1.8.0/1.8.0.sql
+++ b/ee/scripts/helm/db/init_dbs/clickhouse/1.8.0/1.8.0.sql
@@ -150,6 +150,7 @@ CREATE TABLE IF NOT EXISTS autocomplete
       ORDER BY (project_id, type, value)
       TTL _timestamp + INTERVAL 1 MONTH;
 
+-- TODO: remove this table
 CREATE TABLE IF NOT EXISTS errors
 (
     error_id   String,