diff --git a/pkg/resources/database/resource_user.go b/pkg/resources/database/resource_user.go
index 458c452e..f3ab33e3 100644
--- a/pkg/resources/database/resource_user.go
+++ b/pkg/resources/database/resource_user.go
@@ -245,8 +245,11 @@ func UserCreate[T ResourceModelInterface](ctx context.Context, req resource.Crea
 	}
 
 	data.WaitForService(ctx, client, &resp.Diagnostics)
-	data.CreateResource(ctx, client, &diags)
+	if resp.Diagnostics.HasError() {
+		return
+	}
 
+	data.CreateResource(ctx, client, &resp.Diagnostics)
 	if resp.Diagnostics.HasError() {
 		return
 	}