diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index fe6f483cf..e1dfc888d 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -115,35 +115,35 @@ export class PortfolioService {
   }): Promise<AccountWithValue[]> {
     const where: Prisma.AccountWhereInput = { userId };
 
-    const accountFilter = filters?.find(({ type }) => {
+    const filterByAccount = filters?.find(({ type }) => {
       return type === 'ACCOUNT';
-    });
+    })?.id;
 
-    const dataSourceFilter = filters?.find(({ type }) => {
+    const filterByDataSource = filters?.find(({ type }) => {
       return type === 'DATA_SOURCE';
-    });
+    })?.id;
 
-    const symbolFilter = filters?.find(({ type }) => {
+    const filterBySymbol = filters?.find(({ type }) => {
       return type === 'SYMBOL';
-    });
+    })?.id;
+
+    if (filterByAccount) {
+      where.id = filterByAccount;
+    }
 
-    if (dataSourceFilter && symbolFilter) {
+    if (filterByDataSource && filterBySymbol) {
       where.Order = {
         some: {
           SymbolProfile: {
             AND: [
-              { dataSource: <DataSource>dataSourceFilter.id },
-              { symbol: symbolFilter.id }
+              { dataSource: <DataSource>filterByDataSource },
+              { symbol: filterBySymbol }
             ]
           }
         }
       };
     }
 
-    if (accountFilter) {
-      where.id = accountFilter.id;
-    }
-
     const [accounts, details] = await Promise.all([
       this.accountService.accounts({
         where,