diff --git a/CHANGELOG.md b/CHANGELOG.md
index c42ab4f59c..8cacf29521 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,13 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-### [0.6.39] - 2025-11-25
+## [0.6.40] - 2025-11-25
+
+### Fixed
+
+- 🗄️ A critical PostgreSQL user listing performance issue was resolved by removing a redundant count operation that caused severe database slowdowns and potential timeouts when viewing user lists in admin panels.
+
+## [0.6.39] - 2025-11-25
 
 ### Added
 
diff --git a/backend/open_webui/models/users.py b/backend/open_webui/models/users.py
index a66a95a98c..d93f7ddeb3 100644
--- a/backend/open_webui/models/users.py
+++ b/backend/open_webui/models/users.py
@@ -340,7 +340,6 @@ class UsersTable:
                 query = query.order_by(User.created_at.desc())
 
             # Count BEFORE pagination
-            query = query.distinct(User.id)
             total = query.count()
 
             # correct pagination logic
diff --git a/backend/requirements-min.txt b/backend/requirements-min.txt
index 04befcf8c1..c09f1af820 100644
--- a/backend/requirements-min.txt
+++ b/backend/requirements-min.txt
@@ -7,7 +7,7 @@ pydantic==2.11.9
 python-multipart==0.0.20
 itsdangerous==2.2.0
 
-python-socketio==5.13.0
+python-socketio==5.14.0
 python-jose==3.5.0
 cryptography
 bcrypt==5.0.0
diff --git a/backend/requirements.txt b/backend/requirements.txt
index 999818f7a4..658e249090 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -4,7 +4,7 @@ pydantic==2.11.9
 python-multipart==0.0.20
 itsdangerous==2.2.0
 
-python-socketio==5.13.0
+python-socketio==5.14.0
 python-jose==3.5.0
 cryptography
 bcrypt==5.0.0
diff --git a/package-lock.json b/package-lock.json
index 47850a35ef..899f3f5356 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "open-webui",
-	"version": "0.6.39",
+	"version": "0.6.40",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "open-webui",
-			"version": "0.6.39",
+			"version": "0.6.40",
 			"dependencies": {
 				"@azure/msal-browser": "^4.5.0",
 				"@codemirror/lang-javascript": "^6.2.2",
diff --git a/package.json b/package.json
index a887550f53..97bdda0871 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "open-webui",
-	"version": "0.6.39",
+	"version": "0.6.40",
 	"private": true,
 	"scripts": {
 		"dev": "npm run pyodide:fetch && vite dev --host",
diff --git a/pyproject.toml b/pyproject.toml
index fb797a72cc..f0568a4237 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,7 +12,7 @@ dependencies = [
     "python-multipart==0.0.20",
     "itsdangerous==2.2.0",
 
-    "python-socketio==5.13.0",
+    "python-socketio==5.14.0",
     "python-jose==3.5.0",
     "cryptography",
     "bcrypt==5.0.0",
diff --git a/src/lib/components/channel/ChannelInfoModal/UserList.svelte b/src/lib/components/channel/ChannelInfoModal/UserList.svelte
index 8c0c8704c6..a38ad352f9 100644
--- a/src/lib/components/channel/ChannelInfoModal/UserList.svelte
+++ b/src/lib/components/channel/ChannelInfoModal/UserList.svelte
@@ -44,7 +44,7 @@
 	let total = null;
 
 	let query = '';
-	let orderBy = 'created_at'; // default sort key
+	let orderBy = 'name'; // default sort key
 	let direction = 'asc'; // default sort order
 
 	const setSortKey = (key) => {