diff --git a/README.md b/README.md
index ae8410e3..771a5135 100644
--- a/README.md
+++ b/README.md
@@ -118,8 +118,6 @@ If --username and/or --dbname are not specified the current username is used as
 
   --copyright                     (Default: '') glTF asset copyright
 
-  --sql_command_timeout           (Default: 30) SQL command timeout
-
   --default_color                 (Default: #FFFFFF) Default color
 
   --default_metallic_roughness    (Default: #008000) Default metallic roughness
diff --git a/src/pg2b3dm/Options.cs b/src/pg2b3dm/Options.cs
index 9f4d0e9c..7d501624 100644
--- a/src/pg2b3dm/Options.cs
+++ b/src/pg2b3dm/Options.cs
@@ -27,9 +27,6 @@ public class Options
     [Option("copyright", Required = false, Default = "", HelpText = "glTF asset copyright")]
     public string Copyright { get; set; }
 
-    [Option("sql_command_timeout", Required = false, Default = 30, HelpText = "SQL command timeout")]
-    public int SqlCommandTimeout { get; set; }
-
     [Option("default_color", Required = false, Default = "#FFFFFF", HelpText = "Default color")]
     public string DefaultColor { get; set; }
 
diff --git a/src/pg2b3dm/Program.cs b/src/pg2b3dm/Program.cs
index d0b2c6e2..af44004a 100644
--- a/src/pg2b3dm/Program.cs
+++ b/src/pg2b3dm/Program.cs
@@ -30,7 +30,7 @@ static void Main(string[] args)
             o.User = string.IsNullOrEmpty(o.User) ? Environment.UserName : o.User;
             o.Database = string.IsNullOrEmpty(o.Database) ? Environment.UserName : o.Database;
 
-            var connectionString = $"Host={o.Host};Username={o.User};Database={o.Database};Port={o.Port};CommandTimeOut={o.SqlCommandTimeout}";
+            var connectionString = $"Host={o.Host};Username={o.User};Database={o.Database};Port={o.Port};CommandTimeOut=0";
             var istrusted = TrustedConnectionChecker.HasTrustedConnection(connectionString);
             if (!istrusted) {
                 Console.Write($"Password for user {o.User}: ");