diff --git a/octopusdeploy/data_source_user_roles.go b/octopusdeploy/data_source_user_roles.go
index be1ec3f1a..74fbfc82d 100644
--- a/octopusdeploy/data_source_user_roles.go
+++ b/octopusdeploy/data_source_user_roles.go
@@ -26,10 +26,8 @@ func dataSourceUserRolesRead(ctx context.Context, d *schema.ResourceData, meta i
 		Take:        d.Get("take").(int),
 	}
 
-	spaceID := d.Get("space_id").(string)
-
 	client := meta.(*client.Client)
-	existingUserRoles, err := userroles.Get(client, spaceID, query)
+	existingUserRoles, err := userroles.Get(client, "", query)
 	if err != nil {
 		return diag.FromErr(err)
 	}
diff --git a/octopusdeploy/schema_user_role.go b/octopusdeploy/schema_user_role.go
index 9258402e5..cb865af90 100644
--- a/octopusdeploy/schema_user_role.go
+++ b/octopusdeploy/schema_user_role.go
@@ -79,7 +79,6 @@ func getUserRoleDataSchema() map[string]*schema.Schema {
 		"partial_name": getQueryPartialName(),
 		"skip":         getQuerySkip(),
 		"take":         getQueryTake(),
-		"space_id":     getQuerySpaceID(),
 		"user_roles": {
 			Computed:    true,
 			Description: "A list of user roles that match the filter(s).",