diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 4715252e39..56a38c5a53 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -20,6 +20,14 @@ Fixed
 
   contributed by @guzzijones12
 
+* Link shutdown routine and sigterm handler to main thread #5555
+
+  Contributed by @khushboobhatia01
+
+* Change compound index for ActionExecutionDB to improve query performance #5568
+
+  Contributed by @khushboobhatia01
+
 Added
 ~~~~~
 
diff --git a/st2common/st2common/models/db/execution.py b/st2common/st2common/models/db/execution.py
index 1f74661302..0de35a5c31 100644
--- a/st2common/st2common/models/db/execution.py
+++ b/st2common/st2common/models/db/execution.py
@@ -94,7 +94,7 @@ class ActionExecutionDB(stormbase.StormFoundationDB):
             {"fields": ["trigger_type.name"]},
             {"fields": ["trigger_instance.id"]},
             {"fields": ["context.user"]},
-            {"fields": ["-start_timestamp", "action.ref", "status"]},
+            {"fields": ["action.ref", "status", "-start_timestamp"]},
             {"fields": ["workflow_execution"]},
             {"fields": ["task_execution"]},
         ]