diff --git a/modules/swagger-codegen/src/main/resources/go/configuration.mustache b/modules/swagger-codegen/src/main/resources/go/configuration.mustache
index a9bbd48bd94..700755f883b 100644
--- a/modules/swagger-codegen/src/main/resources/go/configuration.mustache
+++ b/modules/swagger-codegen/src/main/resources/go/configuration.mustache
@@ -29,7 +29,7 @@ func NewConfiguration() *Configuration {
         DefaultHeader: make(map[string]string),
         ApiKey: make(map[string]string),
         ApiKeyPrefix: make(map[string]string),
-        UserAgent: "Swagger-Codegen/{{version}}/go",
+        UserAgent: "{{#httpUserAgent}}{{{.}}}{{/httpUserAgent}}{{^httpUserAgent}}Swagger-Codegen/{{{version}}}/go{{/httpUserAgent}}",
         }
 }