diff --git a/google/resource_compute_target_https_proxy.go b/google/resource_compute_target_https_proxy.go
index 9d3bce7c78b..241e571c3f3 100644
--- a/google/resource_compute_target_https_proxy.go
+++ b/google/resource_compute_target_https_proxy.go
@@ -457,6 +457,9 @@ func flattenComputeTargetHttpsProxyName(v interface{}, d *schema.ResourceData) i
 }
 
 func flattenComputeTargetHttpsProxyQuicOverride(v interface{}, d *schema.ResourceData) interface{} {
+	if v == nil || v.(string) == "" {
+		return "NONE"
+	}
 	return v
 }
 
diff --git a/google/resource_sql_database_instance_test.go b/google/resource_sql_database_instance_test.go
index 069037b74f2..11c939db0d2 100644
--- a/google/resource_sql_database_instance_test.go
+++ b/google/resource_sql_database_instance_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/terraform"
-
 	sqladmin "google.golang.org/api/sqladmin/v1beta4"
 )