diff --git a/migration/iD11/oracle/202406131736_IDEMPIERE-6169.sql b/migration/iD11/oracle/202406131736_IDEMPIERE-6169.sql
new file mode 100644
index 0000000000..f1564872e8
--- /dev/null
+++ b/migration/iD11/oracle/202406131736_IDEMPIERE-6169.sql
@@ -0,0 +1,12 @@
+-- IDEMPIERE-6169 Performance on AD_ChangeLog with Record_UU
+SELECT register_migration_script('202406131736_IDEMPIERE-6169.sql') FROM dual;
+
+ALTER TABLE ad_changelog DROP CONSTRAINT ad_changelog_key
+;
+
+DROP INDEX ad_changelog_key
+;
+
+ALTER TABLE ad_changelog ADD CONSTRAINT ad_changelog_pkey PRIMARY KEY (ad_session_id, ad_column_id, ad_changelog_id)
+;
+
diff --git a/migration/iD11/postgresql/202406131736_IDEMPIERE-6169.sql b/migration/iD11/postgresql/202406131736_IDEMPIERE-6169.sql
new file mode 100644
index 0000000000..f1c233ddaf
--- /dev/null
+++ b/migration/iD11/postgresql/202406131736_IDEMPIERE-6169.sql
@@ -0,0 +1,9 @@
+-- IDEMPIERE-6169 Performance on AD_ChangeLog with Record_UU
+SELECT register_migration_script('202406131736_IDEMPIERE-6169.sql') FROM dual;
+
+ALTER TABLE ad_changelog DROP CONSTRAINT ad_changelog_pkey
+;
+
+ALTER TABLE ad_changelog ADD CONSTRAINT ad_changelog_pkey PRIMARY KEY (ad_session_id, ad_column_id, ad_changelog_id)
+;
+