diff --git a/ee/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql b/ee/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql
index 86293a3c2..c8028d677 100644
--- a/ee/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql
+++ b/ee/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql
@@ -44,5 +44,7 @@ CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_unique_project_id_md
 BEGIN;
 
 DROP INDEX IF EXISTS autocomplete_unique;
+DROP INDEX IF EXISTS events_common.requests_response_body_nn_idx;
+DROP INDEX IF EXISTS events_common.requests_request_body_nn_idx;
 
 COMMIT;
\ No newline at end of file
diff --git a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
index 1a8da17ab..dab720b73 100644
--- a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -1203,9 +1203,7 @@ $$
                                                                                                              ELSE 0 END))
                                                                                                   gin_trgm_ops);
             CREATE INDEX IF NOT EXISTS requests_timestamp_session_id_failed_idx ON events_common.requests (timestamp, session_id) WHERE success = FALSE;
-            CREATE INDEX IF NOT EXISTS requests_request_body_nn_idx ON events_common.requests (request_body) WHERE request_body IS NOT NULL;
             CREATE INDEX IF NOT EXISTS requests_request_body_nn_gin_idx ON events_common.requests USING GIN (request_body gin_trgm_ops) WHERE request_body IS NOT NULL;
-            CREATE INDEX IF NOT EXISTS requests_response_body_nn_idx ON events_common.requests (response_body) WHERE response_body IS NOT NULL;
             CREATE INDEX IF NOT EXISTS requests_response_body_nn_gin_idx ON events_common.requests USING GIN (response_body gin_trgm_ops) WHERE response_body IS NOT NULL;
             CREATE INDEX IF NOT EXISTS requests_status_code_nn_idx ON events_common.requests (status_code) WHERE status_code IS NOT NULL;
             CREATE INDEX IF NOT EXISTS requests_host_nn_idx ON events_common.requests (host) WHERE host IS NOT NULL;
diff --git a/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql b/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql
index 84b650861..537c2082a 100644
--- a/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql
+++ b/scripts/helm/db/init_dbs/postgresql/1.8.0/1.8.0.sql
@@ -44,5 +44,6 @@ CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_unique_project_id_md
 BEGIN;
 
 DROP INDEX IF EXISTS autocomplete_unique;
-
+DROP INDEX IF EXISTS events_common.requests_response_body_nn_idx;
+DROP INDEX IF EXISTS events_common.requests_request_body_nn_idx;
 COMMIT;
\ No newline at end of file
diff --git a/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
index f1179e995..77cab0e7b 100644
--- a/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -604,9 +604,7 @@ $$
                                                                                                                   ELSE 0 END))
                                                                                     gin_trgm_ops);
             CREATE INDEX requests_timestamp_session_id_failed_idx ON events_common.requests (timestamp, session_id) WHERE success = FALSE;
-            CREATE INDEX requests_request_body_nn_idx ON events_common.requests (request_body) WHERE request_body IS NOT NULL;
             CREATE INDEX requests_request_body_nn_gin_idx ON events_common.requests USING GIN (request_body gin_trgm_ops) WHERE request_body IS NOT NULL;
-            CREATE INDEX requests_response_body_nn_idx ON events_common.requests (response_body) WHERE response_body IS NOT NULL;
             CREATE INDEX requests_response_body_nn_gin_idx ON events_common.requests USING GIN (response_body gin_trgm_ops) WHERE response_body IS NOT NULL;
             CREATE INDEX requests_status_code_nn_idx ON events_common.requests (status_code) WHERE status_code IS NOT NULL;
             CREATE INDEX requests_host_nn_idx ON events_common.requests (host) WHERE host IS NOT NULL;