diff --git a/EmployeeDirectory/ViewControllers/EmployeesViewController.swift b/EmployeeDirectory/ViewControllers/EmployeesViewController.swift
index 5eb5ae0..cf0026a 100644
--- a/EmployeeDirectory/ViewControllers/EmployeesViewController.swift
+++ b/EmployeeDirectory/ViewControllers/EmployeesViewController.swift
@@ -112,7 +112,6 @@ class EmployeesViewController: UIViewController {
             .sink { [weak self] _ in
                 self?.updateFooter()
                 self?.tableView.reloadData()
-                self?.tableView.refreshControl?.endRefreshing()
             }
             .store(in: &cancellables)
         
@@ -123,6 +122,7 @@ class EmployeesViewController: UIViewController {
                     self?.activityIndicator.startAnimating()
                 } else {
                     self?.activityIndicator.stopAnimating()
+                    self?.tableView.refreshControl?.endRefreshing() // End refresh control
                 }
             }
             .store(in: &cancellables)
diff --git a/EmployeeDirectory/ViewModels/EmployeesViewModel.swift b/EmployeeDirectory/ViewModels/EmployeesViewModel.swift
index 95571ff..df3fd2d 100644
--- a/EmployeeDirectory/ViewModels/EmployeesViewModel.swift
+++ b/EmployeeDirectory/ViewModels/EmployeesViewModel.swift
@@ -65,13 +65,12 @@ public class EmployeesViewModel: ObservableObject {
                 totalEmployees = wrapper.total
                 currentPage = page
                 hasMorePages = employees.count < totalEmployees
-                isLoading = false
-
             } catch {
                 // Handle errors
-                isLoading = false
                 errorMessage = "An unexpected error occurred, please try to refresh."
             }
+            
+            isLoading = false
         }
     }