diff --git a/cmd/setup/39.go b/cmd/setup/39.go
new file mode 100644
index 000000000..01b0ddfcb
--- /dev/null
+++ b/cmd/setup/39.go
@@ -0,0 +1,27 @@
+package setup
+
+import (
+	"context"
+	_ "embed"
+
+	"github.com/zitadel/zitadel/internal/database"
+	"github.com/zitadel/zitadel/internal/eventstore"
+)
+
+var (
+	//go:embed 39.sql
+	deleteStaleOrgFields string
+)
+
+type DeleteStaleOrgFields struct {
+	dbClient *database.DB
+}
+
+func (mig *DeleteStaleOrgFields) Execute(ctx context.Context, _ eventstore.Event) error {
+	_, err := mig.dbClient.ExecContext(ctx, deleteStaleOrgFields)
+	return err
+}
+
+func (mig *DeleteStaleOrgFields) String() string {
+	return "39_delete_stale_org_fields"
+}
diff --git a/cmd/setup/39.sql b/cmd/setup/39.sql
new file mode 100644
index 000000000..4abc815c2
--- /dev/null
+++ b/cmd/setup/39.sql
@@ -0,0 +1,6 @@
+DELETE FROM eventstore.fields
+WHERE aggregate_type = 'org'
+AND aggregate_id NOT IN (
+	SELECT id
+	FROM projections.orgs1
+);
diff --git a/cmd/setup/config.go b/cmd/setup/config.go
index f688a2a3a..b0a143b69 100644
--- a/cmd/setup/config.go
+++ b/cmd/setup/config.go
@@ -125,6 +125,7 @@ type Steps struct {
 	s36FillV2Milestones                     *FillV3Milestones
 	s37Apps7OIDConfigsBackChannelLogoutURI  *Apps7OIDConfigsBackChannelLogoutURI
 	s38BackChannelLogoutNotificationStart   *BackChannelLogoutNotificationStart
+	s39DeleteStaleOrgFields                 *DeleteStaleOrgFields
 }
 
 func MustNewSteps(v *viper.Viper) *Steps {
diff --git a/cmd/setup/setup.go b/cmd/setup/setup.go
index aeed1523b..b8ea708cb 100644
--- a/cmd/setup/setup.go
+++ b/cmd/setup/setup.go
@@ -169,6 +169,7 @@ func Setup(ctx context.Context, config *Config, steps *Steps, masterKey string)
 	steps.s36FillV2Milestones = &FillV3Milestones{dbClient: queryDBClient, eventstore: eventstoreClient}
 	steps.s37Apps7OIDConfigsBackChannelLogoutURI = &Apps7OIDConfigsBackChannelLogoutURI{dbClient: esPusherDBClient}
 	steps.s38BackChannelLogoutNotificationStart = &BackChannelLogoutNotificationStart{dbClient: esPusherDBClient, esClient: eventstoreClient}
+	steps.s39DeleteStaleOrgFields = &DeleteStaleOrgFields{dbClient: esPusherDBClient}
 
 	err = projection.Create(ctx, projectionDBClient, eventstoreClient, config.Projections, nil, nil, nil)
 	logging.OnError(err).Fatal("unable to start projections")
@@ -232,6 +233,7 @@ func Setup(ctx context.Context, config *Config, steps *Steps, masterKey string)
 		steps.s32AddAuthSessionID,
 		steps.s33SMSConfigs3TwilioAddVerifyServiceSid,
 		steps.s37Apps7OIDConfigsBackChannelLogoutURI,
+		steps.s39DeleteStaleOrgFields,
 	} {
 		mustExecuteMigration(ctx, eventstoreClient, step, "migration failed")
 	}
diff --git a/internal/repository/org/org.go b/internal/repository/org/org.go
index 95c9c2f3e..cf8a3ce11 100644
--- a/internal/repository/org/org.go
+++ b/internal/repository/org/org.go
@@ -310,23 +310,7 @@ func (e *OrgRemovedEvent) UniqueConstraints() []*eventstore.UniqueConstraint {
 func (e *OrgRemovedEvent) Fields() []*eventstore.FieldOperation {
 	// TODO: project grants are currently not removed because we don't have the relationship between the granted org and the grant
 	return []*eventstore.FieldOperation{
-		eventstore.SetField(
-			e.Aggregate(),
-			orgSearchObject(e.Aggregate().ID),
-			OrgStateSearchField,
-			&eventstore.Value{
-				Value:       domain.OrgStateRemoved,
-				ShouldIndex: true,
-			},
-
-			eventstore.FieldTypeInstanceID,
-			eventstore.FieldTypeResourceOwner,
-			eventstore.FieldTypeAggregateType,
-			eventstore.FieldTypeAggregateID,
-			eventstore.FieldTypeObjectType,
-			eventstore.FieldTypeObjectID,
-			eventstore.FieldTypeFieldName,
-		),
+		eventstore.RemoveSearchFieldsByAggregate(e.Aggregate()),
 	}
 }