diff --git a/mmv1/third_party/terraform/resources/resource_google_project_organization_policy.go b/mmv1/third_party/terraform/resources/resource_google_project_organization_policy.go
index 30836efbd2fa..d1277750987f 100644
--- a/mmv1/third_party/terraform/resources/resource_google_project_organization_policy.go
+++ b/mmv1/third_party/terraform/resources/resource_google_project_organization_policy.go
@@ -60,9 +60,8 @@ func resourceProjectOrgPolicyImporter(d *schema.ResourceData, meta interface{})
 }
 
 func resourceGoogleProjectOrganizationPolicyCreate(d *schema.ResourceData, meta interface{}) error {
-	d.SetId(fmt.Sprintf("%s:%s", d.Get("project"), d.Get("constraint")))
-
 	if isOrganizationPolicyUnset(d) {
+		d.SetId(fmt.Sprintf("%s:%s", d.Get("project"), d.Get("constraint")))
 		return resourceGoogleProjectOrganizationPolicyDelete(d, meta)
 	}
 
@@ -70,6 +69,8 @@ func resourceGoogleProjectOrganizationPolicyCreate(d *schema.ResourceData, meta
 		return err
 	}
 
+	d.SetId(fmt.Sprintf("%s:%s", d.Get("project"), d.Get("constraint")))
+
 	return resourceGoogleProjectOrganizationPolicyRead(d, meta)
 }