diff --git a/CHANGELOG.md b/CHANGELOG.md
index 419448542..5e6ab06b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# v13.3.2 (2022-05-12)
+* **grid** set first page when page index exists
+
 # v13.3.1 (2022-05-11)
 * **grid** set proper import path
 
diff --git a/package-lock.json b/package-lock.json
index bea78ab69..a5817e27c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-components",
-  "version": "13.3.1",
+  "version": "13.3.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
diff --git a/package.json b/package.json
index 6abd89dcd..124a33042 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angular-components",
-  "version": "13.3.1",
+  "version": "13.3.2",
   "author": {
     "name": "UiPath Inc",
     "url": "https://uipath.com"
diff --git a/projects/angular/components/ui-grid/src/managers/filter-manager.spec.ts b/projects/angular/components/ui-grid/src/managers/filter-manager.spec.ts
index c8c168ad9..30f47ee72 100644
--- a/projects/angular/components/ui-grid/src/managers/filter-manager.spec.ts
+++ b/projects/angular/components/ui-grid/src/managers/filter-manager.spec.ts
@@ -145,6 +145,7 @@ describe('Component: UiGrid', () => {
 
                 it('should set page index to 0', (done) => {
                 const footer = new UiGridFooterDirective();
+                footer.state.pageIndex = 2;
                     footer.pageChange
                         .pipe(
                             first(),
diff --git a/projects/angular/components/ui-grid/src/managers/filter-manager.ts b/projects/angular/components/ui-grid/src/managers/filter-manager.ts
index c361f80d6..85051d264 100644
--- a/projects/angular/components/ui-grid/src/managers/filter-manager.ts
+++ b/projects/angular/components/ui-grid/src/managers/filter-manager.ts
@@ -96,10 +96,12 @@ export class FilterManager<T> {
         header.searchValue = term;
         header.searchTerm.emit(term);
         header.searchFilter.emit(searchFilterCollection);
-        footer?.pageChange.emit({
-            pageIndex: 0,
-            pageSize: footer.state.pageSize,
-        });
+        if (footer?.state.pageIndex) {
+            footer.pageChange.emit({
+                pageIndex: 0,
+                pageSize: footer.state.pageSize,
+            });
+        }
     }
 
     private _updateFilterValue = (
diff --git a/projects/angular/package.json b/projects/angular/package.json
index 59a545de4..10befd11e 100644
--- a/projects/angular/package.json
+++ b/projects/angular/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@uipath/angular",
-    "version": "13.3.1",
+    "version": "13.3.2",
     "license": "MIT",
     "author": {
         "name": "UiPath Inc",