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 c8028d677..8347a5c78 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
@@ -31,6 +31,7 @@ ALTER TABLE IF EXISTS alerts
 ALTER TABLE IF EXISTS sessions
     ADD COLUMN IF NOT EXISTS referrer      text NULL DEFAULT NULL,
     ADD COLUMN IF NOT EXISTS base_referrer text NULL DEFAULT NULL;
+CREATE INDEX IF NOT EXISTS sessions_base_referrer_gin_idx ON public.sessions USING GIN (base_referrer gin_trgm_ops);
 
 ALTER TABLE IF EXISTS events.performance
     ADD COLUMN IF NOT EXISTS host  text NULL DEFAULT NULL,
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 dab720b73..91cb307eb 100644
--- a/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/ee/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -604,6 +604,7 @@ $$
             CREATE INDEX IF NOT EXISTS sessions_utm_source_gin_idx ON public.sessions USING GIN (utm_source gin_trgm_ops);
             CREATE INDEX IF NOT EXISTS sessions_utm_medium_gin_idx ON public.sessions USING GIN (utm_medium gin_trgm_ops);
             CREATE INDEX IF NOT EXISTS sessions_utm_campaign_gin_idx ON public.sessions USING GIN (utm_campaign gin_trgm_ops);
+            CREATE INDEX IF NOT EXISTS sessions_base_referrer_gin_idx ON public.sessions USING GIN (base_referrer gin_trgm_ops);
             BEGIN
                 ALTER TABLE public.sessions
                     ADD CONSTRAINT web_browser_constraint CHECK (
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 537c2082a..b14b14f91 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
@@ -31,6 +31,7 @@ ALTER TABLE IF EXISTS alerts
 ALTER TABLE IF EXISTS sessions
     ADD COLUMN IF NOT EXISTS referrer      text NULL DEFAULT NULL,
     ADD COLUMN IF NOT EXISTS base_referrer text NULL DEFAULT NULL;
+CREATE INDEX IF NOT EXISTS sessions_base_referrer_gin_idx ON public.sessions USING GIN (base_referrer gin_trgm_ops);
 
 ALTER TABLE IF EXISTS events.performance
     ADD COLUMN IF NOT EXISTS host  text NULL DEFAULT NULL,
diff --git a/scripts/helm/db/init_dbs/postgresql/init_schema.sql b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
index 77cab0e7b..c172c1d76 100644
--- a/scripts/helm/db/init_dbs/postgresql/init_schema.sql
+++ b/scripts/helm/db/init_dbs/postgresql/init_schema.sql
@@ -498,6 +498,8 @@ $$
             CREATE INDEX sessions_utm_source_gin_idx ON public.sessions USING GIN (utm_source gin_trgm_ops);
             CREATE INDEX sessions_utm_medium_gin_idx ON public.sessions USING GIN (utm_medium gin_trgm_ops);
             CREATE INDEX sessions_utm_campaign_gin_idx ON public.sessions USING GIN (utm_campaign gin_trgm_ops);
+            CREATE INDEX sessions_base_referrer_gin_idx ON public.sessions USING GIN (base_referrer gin_trgm_ops);
+
 
             ALTER TABLE public.sessions
                 ADD CONSTRAINT web_browser_constraint CHECK (