diff --git a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs
index 459ff92494..59a9e3ec3b 100644
--- a/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs
+++ b/src/chocolatey/infrastructure.app/builders/ConfigurationBuilder.cs
@@ -379,8 +379,9 @@ private static void set_global_options(IList<string> args, ChocolateyConfigurati
                             option =>
                             {
                                 int timeout = 0;
-                                int.TryParse(option.remove_surrounding_quotes(), out timeout);
-                                if (timeout > 0)
+                                var timeoutString = option.remove_surrounding_quotes();
+                                int.TryParse(timeoutString, out timeout);
+                                if (timeout > 0 || timeoutString.is_equal_to("0"))
                                 {
                                     config.CommandExecutionTimeoutSeconds = timeout;
                                 }