diff --git a/ee/scripts/helm/db/init_dbs/postgresql/1.7.0/1.7.0.sql b/ee/scripts/helm/db/init_dbs/postgresql/1.7.0/1.7.0.sql
index 1ea5c6ab6..cdf316fa4 100644
--- a/ee/scripts/helm/db/init_dbs/postgresql/1.7.0/1.7.0.sql
+++ b/ee/scripts/helm/db/init_dbs/postgresql/1.7.0/1.7.0.sql
@@ -56,6 +56,7 @@ ALTER TABLE IF EXISTS events.resources
         PRIMARY KEY (session_id, message_id, timestamp);
 
 COMMIT;
+CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_unique_project_id_md5value_type_idx ON autocomplete (project_id, md5(value), type);
 CREATE INDEX CONCURRENTLY IF NOT EXISTS projects_tenant_id_idx ON public.projects (tenant_id);
 CREATE INDEX CONCURRENTLY IF NOT EXISTS projects_project_id_deleted_at_n_idx ON public.projects (project_id) WHERE deleted_at IS NULL;
 ALTER TYPE metric_type ADD VALUE IF NOT EXISTS 'funnel';
@@ -211,4 +212,5 @@ $$
         END IF;
     END
 $$;
+DROP INDEX IF EXISTS autocomplete_unique;
 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 2d1c2b95f..e236ce90e 100644
--- a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -658,7 +658,7 @@ $$
                 project_id integer NOT NULL REFERENCES projects (project_id) ON DELETE CASCADE
             );
 
-            CREATE unique index IF NOT EXISTS autocomplete_unique ON autocomplete (project_id, value, type);
+            CREATE UNIQUE INDEX IF NOT EXISTS autocomplete_unique_project_id_md5value_type_idx ON autocomplete (project_id, md5(value), type);
             CREATE index IF NOT EXISTS autocomplete_project_id_idx ON autocomplete (project_id);
             CREATE INDEX IF NOT EXISTS autocomplete_type_idx ON public.autocomplete (type);
 
diff --git a/scripts/helm/db/init_dbs/postgresql/1.7.0/1.7.0.sql b/scripts/helm/db/init_dbs/postgresql/1.7.0/1.7.0.sql
index c079b9b69..edc751da9 100644
--- a/scripts/helm/db/init_dbs/postgresql/1.7.0/1.7.0.sql
+++ b/scripts/helm/db/init_dbs/postgresql/1.7.0/1.7.0.sql
@@ -45,6 +45,7 @@ ALTER TABLE IF EXISTS events.resources
         PRIMARY KEY (session_id, message_id, timestamp);
 
 COMMIT;
+CREATE UNIQUE INDEX CONCURRENTLY IF NOT EXISTS autocomplete_unique_project_id_md5value_type_idx ON autocomplete (project_id, md5(value), type);
 CREATE INDEX CONCURRENTLY IF NOT EXISTS projects_project_id_deleted_at_n_idx ON public.projects (project_id) WHERE deleted_at IS NULL;
 ALTER TYPE metric_type ADD VALUE IF NOT EXISTS 'funnel';
 
@@ -199,4 +200,5 @@ $$
         END IF;
     END
 $$;
+DROP INDEX IF EXISTS autocomplete_unique;
 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 c96bc9fc9..5f23d7a79 100644
--- a/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -839,7 +839,7 @@ $$
                 project_id integer NOT NULL REFERENCES projects (project_id) ON DELETE CASCADE
             );
 
-            CREATE unique index autocomplete_unique ON autocomplete (project_id, value, type);
+            CREATE UNIQUE INDEX autocomplete_unique_project_id_md5value_type_idx ON autocomplete (project_id, md5(value), type);
             CREATE index autocomplete_project_id_idx ON autocomplete (project_id);
             CREATE INDEX autocomplete_type_idx ON public.autocomplete (type);