diff --git a/src/app/clients/clients.component.ts b/src/app/clients/clients.component.ts
index 663f6b37a..e44c19ff0 100644
--- a/src/app/clients/clients.component.ts
+++ b/src/app/clients/clients.component.ts
@@ -49,6 +49,7 @@ export class ClientsComponent implements OnInit {
    */
   search(value: string) {
     this.filterText = value;
+    this.resetPaginator();
     this.getClients();
   }
 
@@ -82,8 +83,12 @@ export class ClientsComponent implements OnInit {
       this.sortAttribute = event.active;
       this.sortDirection = event.direction;
     }
-    this.currentPage = 0;
-    this.paginator.firstPage();
+    this.resetPaginator();
     this.getClients();
   }
+
+  private resetPaginator() {
+    this.currentPage = 0;
+    this.paginator.firstPage();
+  }
 }