diff --git a/modules/openapi-generator/src/main/resources/go-server/routers.mustache b/modules/openapi-generator/src/main/resources/go-server/routers.mustache
index 47eb32493d4..dd17c61df84 100644
--- a/modules/openapi-generator/src/main/resources/go-server/routers.mustache
+++ b/modules/openapi-generator/src/main/resources/go-server/routers.mustache
@@ -108,7 +108,11 @@ func EncodeJSONResponse(i interface{}, status *int,{{#addResponseHeaders}} heade
 		w.WriteHeader(http.StatusOK)
 	}
 
-	return json.NewEncoder(w).Encode(i)
+    if i != nil {
+        return json.NewEncoder(w).Encode(i)
+    }
+
+    return nil
 }
 
 // ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file
diff --git a/samples/server/petstore/go-api-server/go/routers.go b/samples/server/petstore/go-api-server/go/routers.go
index 9c358e93b43..501ef7d89f3 100644
--- a/samples/server/petstore/go-api-server/go/routers.go
+++ b/samples/server/petstore/go-api-server/go/routers.go
@@ -76,7 +76,11 @@ func EncodeJSONResponse(i interface{}, status *int, headers map[string][]string,
 		w.WriteHeader(http.StatusOK)
 	}
 
-	return json.NewEncoder(w).Encode(i)
+    if i != nil {
+        return json.NewEncoder(w).Encode(i)
+    }
+
+    return nil
 }
 
 // ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file
diff --git a/samples/server/petstore/go-chi-server/go/routers.go b/samples/server/petstore/go-chi-server/go/routers.go
index f6134e34527..1fa25065606 100644
--- a/samples/server/petstore/go-chi-server/go/routers.go
+++ b/samples/server/petstore/go-chi-server/go/routers.go
@@ -72,7 +72,11 @@ func EncodeJSONResponse(i interface{}, status *int, headers map[string][]string,
 		w.WriteHeader(http.StatusOK)
 	}
 
-	return json.NewEncoder(w).Encode(i)
+    if i != nil {
+        return json.NewEncoder(w).Encode(i)
+    }
+
+    return nil
 }
 
 // ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file
diff --git a/samples/server/petstore/go-server-required/go/routers.go b/samples/server/petstore/go-server-required/go/routers.go
index f6134e34527..1fa25065606 100644
--- a/samples/server/petstore/go-server-required/go/routers.go
+++ b/samples/server/petstore/go-server-required/go/routers.go
@@ -72,7 +72,11 @@ func EncodeJSONResponse(i interface{}, status *int, headers map[string][]string,
 		w.WriteHeader(http.StatusOK)
 	}
 
-	return json.NewEncoder(w).Encode(i)
+    if i != nil {
+        return json.NewEncoder(w).Encode(i)
+    }
+
+    return nil
 }
 
 // ReadFormFileToTempFile reads file data from a request form and writes it to a temporary file