diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md
index 7456053f..755b635e 100644
--- a/doc/82-Changelog.md
+++ b/doc/82-Changelog.md
@@ -29,6 +29,7 @@ next (will be 1.9.0)
 ### User Interface
 * FIX: allow switching DB config while connection is failing (#2300)
 * FIX: Links to duplicate services in Sets didn't check for deactivation (#2323)
+* FIX: SQL error for Data Fields table on PostgreSQL (#2310)
 * FEATURE: show "deprecated" flag on object attribute inspection (#2312)
 * FEATURE: Service Template for single Host services provides auto-completion (#1974)
 
diff --git a/library/Director/Web/Table/DatafieldTable.php b/library/Director/Web/Table/DatafieldTable.php
index 44a1a860..4b321d7b 100644
--- a/library/Director/Web/Table/DatafieldTable.php
+++ b/library/Director/Web/Table/DatafieldTable.php
@@ -85,7 +85,7 @@ class DatafieldTable extends ZfQueryBasedTable
             ['used_vars' => $db->select()->union($varsQueries, ZfDbSelect::SQL_UNION_ALL)],
             'used_vars.varname = df.varname',
             []
-        )->group('df.id')->group('df.varname')->order('caption ASC');
+        )->group('df.id')->group('df.varname')->group('dfc.category_name')->order('caption ASC');
     }
 
     /**