diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java
index 84da712..4e092d0 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/controller/ExpenseController.java
@@ -124,6 +124,8 @@ public class ExpenseController {
                 else if(lastUnit.get().equalsIgnoreCase("month"))
                     expenses = expenseService.getLastMonthTransactions(email).stream().map(expenseMapper::toDto).toList();
 
+            } else {
+                expenses = userService.getUserByEmail(email).getExpenses().stream().map(expenseMapper::toDto).toList();
             }
 
             return ResponseEntity.ok(expenses);
diff --git a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java
index c66a544..1a9f179 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/controller/IncomeController.java
@@ -124,6 +124,8 @@ public class IncomeController {
                 else if(lastUnit.get().equalsIgnoreCase("month"))
                     incomes = incomeService.getLastMonthTransactions(email).stream().map(incomeMapper::toDto).toList();
 
+            } else {
+                incomes = userService.getUserByEmail(email).getIncomes().stream().map(incomeMapper::toDto).toList();
             }
 
             return ResponseEntity.ok(incomes);
diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java
index 1ded82e..0a605cb 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/service/ExpenseService.java
@@ -1,6 +1,9 @@
 package com.faf223.expensetrackerfaf.service;
 
-import com.faf223.expensetrackerfaf.model.*;
+import com.faf223.expensetrackerfaf.model.Credential;
+import com.faf223.expensetrackerfaf.model.Expense;
+import com.faf223.expensetrackerfaf.model.IMoneyTransaction;
+import com.faf223.expensetrackerfaf.model.User;
 import com.faf223.expensetrackerfaf.repository.CredentialRepository;
 import com.faf223.expensetrackerfaf.repository.ExpenseRepository;
 import com.faf223.expensetrackerfaf.repository.UserRepository;
@@ -12,7 +15,6 @@ import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDate;
 import java.time.Month;
@@ -49,6 +51,7 @@ public class ExpenseService implements ITransactionService {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public List<Expense> getTransactionsByDate(LocalDate date, String email) {
         return (List<Expense>) transactionFilter.filterByEmail(getTransactionsByDate(date), email);
     }
@@ -59,6 +62,7 @@ public class ExpenseService implements ITransactionService {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public List<Expense> getTransactionsByMonth(Month month, String email) {
         return (List<Expense>) transactionFilter.filterByEmail(getTransactionsByMonth(month), email);
     }
@@ -69,6 +73,7 @@ public class ExpenseService implements ITransactionService {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public List<Expense> getLastWeekTransactions(String email) {
         return (List<Expense>) transactionFilter.filterByEmail(getLastWeekTransactions(), email);
     }
@@ -79,6 +84,7 @@ public class ExpenseService implements ITransactionService {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public List<Expense> getLastMonthTransactions(String email) {
         return (List<Expense>) transactionFilter.filterByEmail(getLastMonthTransactions(), email);
     }
@@ -89,6 +95,7 @@ public class ExpenseService implements ITransactionService {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public List<Expense> getYearIntervalTransactions(String email, int start, int end) {
         return (List<Expense>) transactionFilter.filterByEmail(getYearIntervalTransactions(start, end), email);
     }
diff --git a/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java
index 5b56d4b..61ac152 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java
+++ b/src/main/java/com/faf223/expensetrackerfaf/service/IncomeService.java
@@ -55,6 +55,7 @@ public class IncomeService implements ITransactionService {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public List<Income> getTransactionsByDate(LocalDate date, String email) {
         return (List<Income>) transactionFilter.filterByEmail(getTransactionsByDate(date), email);
     }
@@ -65,6 +66,7 @@ public class IncomeService implements ITransactionService {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public List<Income> getTransactionsByMonth(Month month, String email) {
         return (List<Income>) transactionFilter.filterByEmail(getTransactionsByMonth(month), email);
     }
@@ -75,6 +77,7 @@ public class IncomeService implements ITransactionService {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public List<Income> getLastWeekTransactions(String email) {
         return (List<Income>) transactionFilter.filterByEmail(getLastWeekTransactions(), email);
     }
@@ -85,6 +88,7 @@ public class IncomeService implements ITransactionService {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public List<Income> getLastMonthTransactions(String email) {
         return (List<Income>) transactionFilter.filterByEmail(getLastMonthTransactions(), email);
     }
@@ -95,6 +99,7 @@ public class IncomeService implements ITransactionService {
     }
 
     @Override
+    @SuppressWarnings("unchecked")
     public List<Income> getYearIntervalTransactions(String email, int start, int end) {
         return (List<Income>) transactionFilter.filterByEmail(getYearIntervalTransactions(start, end), email);
     }