diff --git a/internal/resource/infrastructure_stack_model.go b/internal/resource/infrastructure_stack_model.go
index e19c286..f053a62 100644
--- a/internal/resource/infrastructure_stack_model.go
+++ b/internal/resource/infrastructure_stack_model.go
@@ -168,14 +168,13 @@ func (isr *InfrastructureStackRepository) Attributes() gqlclient.GitRefAttribute
 }
 
 func (isr *InfrastructureStackRepository) From(repository *gqlclient.GitRepositoryFragment, ref gqlclient.GitRefFragment) {
-	isr.Ref = types.StringValue(ref.Ref)
-	isr.Folder = types.StringValue(ref.Folder)
-
 	if isr == nil {
 		return
 	}
 
 	isr.Id = types.StringValue(repository.ID)
+	isr.Ref = types.StringValue(ref.Ref)
+	isr.Folder = types.StringValue(ref.Folder)
 }
 
 type InfrastructureStackHookSpec struct {