diff --git a/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/__snapshots__/go-client.test.js.md b/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/__snapshots__/go-client.test.js.md
index 93ce1db9a9..4ebe7f59c9 100644
--- a/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/__snapshots__/go-client.test.js.md
+++ b/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/__snapshots__/go-client.test.js.md
@@ -74,7 +74,7 @@ Generated by [AVA](https://ava.li).
     ␊
     ␊
     var DefaultEndpoint = http://localhost:4466/test/test␊
-    var Secret          = ␊
+    var Secret          = ""␊
     ␊
     ␊
           type PostsParams struct {␊
diff --git a/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/__snapshots__/go-client.test.js.snap b/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/__snapshots__/go-client.test.js.snap
index 0074c9c84d..58898b71eb 100644
Binary files a/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/__snapshots__/go-client.test.js.snap and b/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/__snapshots__/go-client.test.js.snap differ
diff --git a/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/env-interpolation/__snapshots__/go-env.test.js.md b/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/env-interpolation/__snapshots__/go-env.test.js.md
index eb55de4832..e19239e1a9 100644
--- a/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/env-interpolation/__snapshots__/go-env.test.js.md
+++ b/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/env-interpolation/__snapshots__/go-env.test.js.md
@@ -4,6 +4,12 @@ The actual snapshot is saved in `go-env.test.js.snap`.
 
 Generated by [AVA](https://ava.li).
 
+## go env interpolation - empty
+
+> Snapshot 1
+
+    '""'
+
 ## go env interpolation - environment multiple
 
 > Snapshot 1
@@ -16,6 +22,12 @@ Generated by [AVA](https://ava.li).
 
     'os.Getenv("PRISMA_ENDPOINT")'
 
+## go env interpolation - null
+
+> Snapshot 1
+
+    '""'
+
 ## go env interpolation - plain
 
 > Snapshot 1
diff --git a/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/env-interpolation/__snapshots__/go-env.test.js.snap b/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/env-interpolation/__snapshots__/go-env.test.js.snap
index c28535e401..53d4c4e88e 100644
Binary files a/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/env-interpolation/__snapshots__/go-env.test.js.snap and b/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/env-interpolation/__snapshots__/go-env.test.js.snap differ
diff --git a/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/env-interpolation/go-env.test.ts b/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/env-interpolation/go-env.test.ts
index 1d975c0a78..81173b2aa9 100644
--- a/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/env-interpolation/go-env.test.ts
+++ b/cli/packages/prisma-client-lib/src/codegen/generators/__tests__/env-interpolation/go-env.test.ts
@@ -1,6 +1,16 @@
 import { GoGenerator } from '../../go-client'
 import { test } from 'ava'
 
+test('go env interpolation - empty', t => {
+  const result = GoGenerator.replaceEnv(``)
+  t.snapshot(result)
+})
+
+test('go env interpolation - null', t => {
+  const result = GoGenerator.replaceEnv(null as any)
+  t.snapshot(result)
+})
+
 test('go env interpolation - plain', t => {
   const result = GoGenerator.replaceEnv(`http://localhost:4466/test/dev`)
   t.snapshot(result)
diff --git a/cli/packages/prisma-client-lib/src/codegen/generators/go-client.ts b/cli/packages/prisma-client-lib/src/codegen/generators/go-client.ts
index 19a2dbfdbb..d4a14f8058 100644
--- a/cli/packages/prisma-client-lib/src/codegen/generators/go-client.ts
+++ b/cli/packages/prisma-client-lib/src/codegen/generators/go-client.ts
@@ -815,7 +815,7 @@ func (client *Client) GraphQL(ctx context.Context, query string, variables map[s
     const dynamic = `
 
 var DefaultEndpoint = ${options.endpoint}
-var Secret          = ${options.secret || ''}
+var Secret          = ${options.secret || `""`}
 
 ${this.printOperation(queryFields, 'query', options)}