diff --git a/internal/tools/orchestrator/hepa/services/org_client/impl/impl.go b/internal/tools/orchestrator/hepa/services/org_client/impl/impl.go
index 386e300768d..207b00250d2 100644
--- a/internal/tools/orchestrator/hepa/services/org_client/impl/impl.go
+++ b/internal/tools/orchestrator/hepa/services/org_client/impl/impl.go
@@ -164,6 +164,10 @@ func (impl GatewayOrgClientServiceImpl) GetCredentials(id string) (res dto.Clien
 	if err != nil {
 		return
 	}
+	if dao == nil {
+		err = errors.New("client not found")
+		return
+	}
 	res = dto.ClientInfoDto{
 		ClientId:     dao.Id,
 		ClientSecret: dao.ClientSecret,