diff --git a/client/organization.go b/client/organization.go
index 90689222..1e349ac8 100644
--- a/client/organization.go
+++ b/client/organization.go
@@ -29,11 +29,15 @@ func (h *V1Client) ListOrganizations() ([]*models.V1Organization, error) {
 // SwitchOrganization switches the caller's active organization.
 // Returns an authorization token for the target organization.
 func (h *V1Client) SwitchOrganization(orgName string) (string, error) {
-	params := clientv1.NewV1AuthOrgSwitchParamsWithContext(h.ctx).
-		WithOrgName(orgName)
-	resp, err := h.Client.V1AuthOrgSwitch(params)
-	if err != nil || resp == nil {
-		return "", err
-	}
-	return resp.Payload.Authorization, nil
+
+	// Need to update this fix , currently HAPI restricted `V1AuthOrgSwitch`
+
+	//params:= clientv1.NewV1AuthOrgSwitchParamsWithContext(h.ctx).
+	//	WithOrgName(orgName)
+	//resp, err := h.Client.V1AuthOrgSwitch(params)
+	//if err != nil || resp == nil {
+	//	return "", err
+	//}
+	//return resp.Payload.Authorization, nil
+	return "", nil
 }