diff --git a/apps/dokploy/components/shared/update-database-password.tsx b/apps/dokploy/components/shared/update-database-password.tsx
index a48e78bb9..fa5c42b6c 100644
--- a/apps/dokploy/components/shared/update-database-password.tsx
+++ b/apps/dokploy/components/shared/update-database-password.tsx
@@ -56,12 +56,21 @@ export const UpdateDatabasePassword = ({
 			form.reset();
 			setIsOpen(false);
 		} catch (e) {
-			setError(e instanceof Error ? e.message : "Error updating password");
+			const raw = e instanceof Error ? e.message : "Error updating password";
+			const noContainer = raw.match(/No running container found for \S+/);
+			if (noContainer) {
+				setError(
+					"The database container is not running. Please start the service before changing the password.",
+				);
+			} else {
+				setError(
+					"Error updating password. Please check that the container is running and try again.",
+				);
+			}
 		} finally {
 			setIsPending(false);
 		}
 	};
-
 	return (
 		<Dialog
 			open={isOpen}
diff --git a/apps/dokploy/server/api/routers/postgres.ts b/apps/dokploy/server/api/routers/postgres.ts
index 72485c882..8fa25034b 100644
--- a/apps/dokploy/server/api/routers/postgres.ts
+++ b/apps/dokploy/server/api/routers/postgres.ts
@@ -424,7 +424,6 @@ export const postgresRouter = createTRPCRouter({
 				fi
 				docker exec "$CONTAINER_ID" psql -U ${databaseUser} -c "ALTER USER \\"${databaseUser}\\" WITH PASSWORD '${password}';"
 			`;
-
 			if (serverId) {
 				await execAsyncRemote(serverId, command);
 			} else {