diff --git a/nutanix/services/selfservice/resource_nutanix_calm_endpoint.go b/nutanix/services/selfservice/resource_nutanix_calm_endpoint.go
index 94f2fdd1..185c7592 100644
--- a/nutanix/services/selfservice/resource_nutanix_calm_endpoint.go
+++ b/nutanix/services/selfservice/resource_nutanix_calm_endpoint.go
@@ -106,9 +106,9 @@ func createMetadata(meta interface{}) map[string]interface{} {
 	for _, entity := range resp.Entities {
 
 		if entity.Status.Name == projName {
-			projRef["name"] = resp.Entities[0].Status.Name
+			projRef["name"] = entity.Status.Name
 			projRef["kind"] = "project"
-			projRef["uuid"] = resp.Entities[0].Status.UUID
+			projRef["uuid"] = entity.Status.UUID
 		}
 	}