diff --git a/command/v2/org_command.go b/command/v2/org_command.go
index <HASH>..<HASH> 100644
--- a/command/v2/org_command.go
+++ b/command/v2/org_command.go
@@ -56,8 +56,9 @@ func (cmd *OrgCommand) Setup(config command.Config, ui command.UI) error {
 		if _, ok := err.(sharedV3.V3APIDoesNotExistError); !ok {
 			return err
 		}
+	} else {
+		cmd.ActorV3 = v3action.NewActor(ccClientV3, config)
 	}
-	cmd.ActorV3 = v3action.NewActor(ccClientV3, config)
 
 	return nil
 }
diff --git a/command/v2/space_command.go b/command/v2/space_command.go
index <HASH>..<HASH> 100644
--- a/command/v2/space_command.go
+++ b/command/v2/space_command.go
@@ -58,10 +58,10 @@ func (cmd *SpaceCommand) Setup(config command.Config, ui command.UI) error {
 		if _, ok := err.(sharedV3.V3APIDoesNotExistError); !ok {
 			return err
 		}
+	} else {
+		cmd.ActorV3 = v3action.NewActor(ccClientV3, config)
 	}
 
-	cmd.ActorV3 = v3action.NewActor(ccClientV3, config)
-
 	return nil
 }
prevent `cf space` and `cf org` from throwing

- a nil pointer dereference error when targeting an old version of CAPI

[#<I>]