diff --git a/FAnsiSql/Implementations/PostgreSql/PostgreSqlServerHelper.cs b/FAnsiSql/Implementations/PostgreSql/PostgreSqlServerHelper.cs
index 38eac81..a90d349 100644
--- a/FAnsiSql/Implementations/PostgreSql/PostgreSqlServerHelper.cs
+++ b/FAnsiSql/Implementations/PostgreSql/PostgreSqlServerHelper.cs
@@ -11,6 +11,7 @@ namespace FAnsi.Implementations.PostgreSql;
 public sealed class PostgreSqlServerHelper : DiscoveredServerHelper
 {
     public static readonly PostgreSqlServerHelper Instance = new();
+
     private PostgreSqlServerHelper() : base(DatabaseType.PostgreSql)
     {
     }
@@ -47,16 +48,11 @@ public override void CreateDatabase(DbConnectionStringBuilder builder, IHasRunti
 
     public override string? GetExplicitPasswordIfAny(DbConnectionStringBuilder builder) => ((NpgsqlConnectionStringBuilder)builder).Password;
 
-    public override Version? GetVersion(DiscoveredServer server)
+    public override Version GetVersion(DiscoveredServer server)
     {
-        using var con = server.GetConnection();
+        using var con = new NpgsqlConnection(server.Builder.ConnectionString);
         con.Open();
-        using var cmd = server.GetCommand("SHOW server_version", con);
-        using var r = cmd.ExecuteReader();
-        if (r.Read())
-            return r[0] == DBNull.Value ? null : CreateVersionFromString((string)r[0]);
-
-        return null;
+        return con.PostgreSqlVersion;
     }