diff --git a/src/components/paginator/Paginator.vue b/src/components/paginator/Paginator.vue
index af0472ca5..5566a1e20 100644
--- a/src/components/paginator/Paginator.vue
+++ b/src/components/paginator/Paginator.vue
@@ -45,7 +45,10 @@ export default {
             type: Number,
             default: 5
         },
-        rowsPerPageOptions: Array,
+        rowsPerPageOptions: {
+            type: Array,
+            default: null
+        },
         template: {
             type: String,
             default: 'FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink RowsPerPageDropdown'
@@ -66,7 +69,7 @@ export default {
     },
     computed: {
         templateItems() {
-            var keys = [];
+            let keys = [];
             this.template.split(' ').map((value) => {
                 keys.push(value.trim());
             })
@@ -120,17 +123,18 @@ export default {
     },
     methods: {
         changePage(first, rows) {
-            var pc = this.pageCount;
-            var p = Math.floor(first / rows);
+            const pc = this.pageCount;
+            const p = Math.floor(first / rows);
 
-            if(p >= 0 && p < pc) {
-                var newPageState = {
+            if (p >= 0 && p < pc) {
+                let newPageState = {
                     first: first,
                     rows: rows,
                     page: p,
                     pageCount: pc
                 };
-                this.$emit('change', newPageState);
+
+                this.$emit('page-change', newPageState);
 				this.$emit('update:first', first);
 				this.$emit('update:rows', rows);
             }
diff --git a/src/views/paginator/PaginatorDemo.vue b/src/views/paginator/PaginatorDemo.vue
index b7ab3520a..641bab436 100644
--- a/src/views/paginator/PaginatorDemo.vue
+++ b/src/views/paginator/PaginatorDemo.vue
@@ -12,7 +12,7 @@
 			<Paginator :first.sync="first" :rows.sync="rows" :totalRecords="totalRecords" :rowsPerPageOptions="[10,20,30]"></Paginator>
 
 			<h3>Custom Template</h3>
-			<Paginator :first="first2" :rows="rows2" :totalRecords="totalRecords2" @change="onPageChangeCustom($event)" template="FirstPageLink PrevPageLink CurrentPageReport NextPageLink LastPageLink">
+			<Paginator :first="first2" :rows="rows2" :totalRecords="totalRecords2" @page-change="onPageChangeCustom($event)" template="FirstPageLink PrevPageLink CurrentPageReport NextPageLink LastPageLink">
                 <template #left>
                     <Button type="button" icon="pi pi-refresh" />
                 </template>