diff --git a/cmd/setup/09/cockroach/index.sql b/cmd/setup/09/cockroach/index.sql
index 9c26d5e34..1cc161ed1 100644
--- a/cmd/setup/09/cockroach/index.sql
+++ b/cmd/setup/09/cockroach/index.sql
@@ -1,6 +1,6 @@
 -- replace agg_type_agg_id
 BEGIN;
-DROP INDEX eventstore.events@agg_type_agg_id;
+DROP INDEX IF EXISTS eventstore.events@agg_type_agg_id;
 COMMIT;
 
 BEGIN;
@@ -23,7 +23,7 @@ COMMIT;
 
 -- replace agg_type
 BEGIN;
-DROP INDEX eventstore.events@agg_type;
+DROP INDEX IF EXISTS eventstore.events@agg_type;
 COMMIT;
 
 BEGIN;
@@ -49,17 +49,3 @@ COMMIT;
 BEGIN;
 DROP INDEX IF EXISTS eventstore.events@agg_type_seq;
 COMMIT;
-
--- index to search event payload
-BEGIN;
-DROP INDEX IF EXISTS eventstore.events@event_search;
-COMMIT;
-
-BEGIN;
-CREATE INVERTED INDEX event_search ON eventstore.events (
-    instance_id
-    , aggregate_type
-    , event_type
-    , event_data
-);
-COMMIT;
\ No newline at end of file
diff --git a/cmd/setup/09/postgres/index.sql b/cmd/setup/09/postgres/index.sql
index bda0c3953..d5207c15d 100644
--- a/cmd/setup/09/postgres/index.sql
+++ b/cmd/setup/09/postgres/index.sql
@@ -28,12 +28,3 @@ COMMIT;
 BEGIN;
 DROP INDEX IF EXISTS eventstore.agg_type_seq;
 COMMIT;
-
--- index to search event payload
-BEGIN;
-DROP INDEX IF EXISTS eventstore.event_search;
-COMMIT;
-
-BEGIN;
-CREATE INDEX event_search ON eventstore.events USING gin (event_data);
-COMMIT;
\ No newline at end of file