diff --git a/conn.go b/conn.go
index f1f4db0d..0459e6e7 100644
--- a/conn.go
+++ b/conn.go
@@ -78,7 +78,8 @@ type Identifier []string
 func (ident Identifier) Sanitize() string {
 	parts := make([]string, len(ident))
 	for i := range ident {
-		parts[i] = `"` + strings.Replace(ident[i], `"`, `""`, -1) + `"`
+		s := strings.Replace(ident[i], string([]byte{0}), "", -1)
+		parts[i] = `"` + strings.Replace(s, `"`, `""`, -1) + `"`
 	}
 	return strings.Join(parts, ".")
 }
diff --git a/conn_test.go b/conn_test.go
index 063fb0e9..286ff403 100644
--- a/conn_test.go
+++ b/conn_test.go
@@ -647,6 +647,10 @@ func TestIdentifierSanitize(t *testing.T) {
 			ident:    pgx.Identifier{`you should " not do this`, `please don't`},
 			expected: `"you should "" not do this"."please don't"`,
 		},
+		{
+			ident:    pgx.Identifier{`you should ` + string([]byte{0}) + `not do this`},
+			expected: `"you should not do this"`,
+		},
 	}
 
 	for i, tt := range tests {