diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2df75aa4389..e86dc2fea93 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Next release
 
-### Event Triggers for MS SQL Server 
+### Event Triggers for MS SQL Server
 
 (closes https://github.com/hasura/graphql-engine/issues/7228)
 Event Triggers support has been added for MS SQL Server. Now, you can invoke external webhooks on insert/update/delete events on your MS SQL Server tables. See the [docs](https://hasura.io/docs/latest/graphql/core/event-triggers/index/) for more details.
@@ -19,6 +19,7 @@ Event Triggers support has been added for MS SQL Server. Now, you can invoke ext
 - cli: fix perfomance regression with large metadata in `metadata apply`
 - cli: fix error reporting in `metadata apply` command (#8280)
 - server: query runtime performance optimizations
+- server: fix bug that had disabled expression-based indexes in Postgress variants (fix Zendesk 5146)
 
 ## v2.8.0
 
diff --git a/server/src-rsr/citus_table_metadata.sql b/server/src-rsr/citus_table_metadata.sql
index b734b573bb1..97910fb94fc 100644
--- a/server/src-rsr/citus_table_metadata.sql
+++ b/server/src-rsr/citus_table_metadata.sql
@@ -143,7 +143,7 @@ LEFT JOIN LATERAL
           'name', class.relname,
           'oid', class.oid :: integer
           ),
-        'columns', columns.info
+        'columns', coalesce(columns.info, '[]')
         )
       ) AS info
     FROM pg_catalog.pg_index index
diff --git a/server/src-rsr/pg_table_metadata.sql b/server/src-rsr/pg_table_metadata.sql
index 173d8adbcb8..2d470de1a11 100644
--- a/server/src-rsr/pg_table_metadata.sql
+++ b/server/src-rsr/pg_table_metadata.sql
@@ -136,7 +136,7 @@ LEFT JOIN LATERAL
           'name', class.relname,
           'oid', class.oid :: integer
           ),
-        'columns', columns.info
+        'columns', coalesce(columns.info, '[]')
         )
       ) AS info
     FROM pg_catalog.pg_index idx