diff --git a/server/src/main/resources/org/cloudfoundry/identity/uaa/db/hsqldb/V4_113__Add_group_membership_idz_origin_idx.sql b/server/src/main/resources/org/cloudfoundry/identity/uaa/db/hsqldb/V4_113__Add_group_membership_idz_origin_idx.sql
new file mode 100644
index 00000000000..e2f08fcea67
--- /dev/null
+++ b/server/src/main/resources/org/cloudfoundry/identity/uaa/db/hsqldb/V4_113__Add_group_membership_idz_origin_idx.sql
@@ -0,0 +1 @@
+-- NOOP
diff --git a/server/src/main/resources/org/cloudfoundry/identity/uaa/db/mysql/V4_113__Add_group_membership_idz_origin_idx.sql b/server/src/main/resources/org/cloudfoundry/identity/uaa/db/mysql/V4_113__Add_group_membership_idz_origin_idx.sql
new file mode 100644
index 00000000000..63591b4ec4a
--- /dev/null
+++ b/server/src/main/resources/org/cloudfoundry/identity/uaa/db/mysql/V4_113__Add_group_membership_idz_origin_idx.sql
@@ -0,0 +1 @@
+CREATE INDEX group_membership_idz_origin_idx ON group_membership(identity_zone_id, origin) LOCK = SHARED;
\ No newline at end of file
diff --git a/server/src/main/resources/org/cloudfoundry/identity/uaa/db/postgresql/V4_113__Add_group_membership_idz_origin_idx.sql b/server/src/main/resources/org/cloudfoundry/identity/uaa/db/postgresql/V4_113__Add_group_membership_idz_origin_idx.sql
new file mode 100644
index 00000000000..00fc1468ceb
--- /dev/null
+++ b/server/src/main/resources/org/cloudfoundry/identity/uaa/db/postgresql/V4_113__Add_group_membership_idz_origin_idx.sql
@@ -0,0 +1 @@
+CREATE INDEX CONCURRENTLY IF NOT EXISTS group_membership_idz_origin_idx ON group_membership(identity_zone_id, origin);