diff --git a/src/organisms/gv-properties/gv-properties.js b/src/organisms/gv-properties/gv-properties.js
index 9dab8874..d760838c 100644
--- a/src/organisms/gv-properties/gv-properties.js
+++ b/src/organisms/gv-properties/gv-properties.js
@@ -534,7 +534,12 @@ export class GvProperties extends KeyboardElement(LitElement) {
   }
 
   _onPaginate({ detail }) {
-    this._paginationData.current_page = detail.page;
+    if (detail.page) {
+      this._paginationData.current_page = detail.page;
+    }
+    if (detail.size) {
+      this._pageSize = detail.size;
+    }
     this._onClosePropertySchemaForm();
     this.requestUpdate();
   }
diff --git a/src/organisms/gv-properties/gv-properties.stories.js b/src/organisms/gv-properties/gv-properties.stories.js
index 5d4261f5..6e04222b 100644
--- a/src/organisms/gv-properties/gv-properties.stories.js
+++ b/src/organisms/gv-properties/gv-properties.stories.js
@@ -34,6 +34,30 @@ const properties = [
   { key: 'file.separator', value: '/' },
   { key: 'ftp.nonProxyHosts', value: 'local|*.local|169.254/16|*.169.254/16' },
   { key: 'java.awt.headless', value: 'true' },
+  { key: 'java.class.path', value: '/usr/local/Cellar/gradle/6.7.1/libexec/lib/gradle-launcher-6.7.1.jar' },
+  { key: 'java.class.version', value: '55.0' },
+  { key: 'java.endorsed.dirs', value: '/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home/jre/lib/endorsed' },
+  {
+    key: 'java.ext.dirs',
+    value:
+      '/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home/jre/lib/ext:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java',
+  },
+  { key: 'java.home', value: '/Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home/jre' },
+  { key: 'java.io.tmpdir', value: '/var/folders/8z/5q5q5q5q5q5q5q5q5q5q5q5q5q5q5/T/' },
+  {
+    key: 'java.library.path',
+    value:
+      '/Users/gravitee/Library/Java/Extensions:/Library/Java/Extensions:/Network/Library/Java/Extensions:/System/Library/Java/Extensions:/usr/lib/java:.:/usr/local/lib',
+  },
+  { key: 'java.runtime.name', value: 'OpenJDK Runtime Environment' },
+  { key: 'java.runtime.version', value: '1.8.0_272-b10' },
+  { key: 'java.specification.name', value: 'Java Platform API Specification' },
+  { key: 'java.specification.vendor', value: 'Oracle Corporation' },
+  { key: 'java.specification.version', value: '1.8' },
+  { key: 'java.vendor', value: 'AdoptOpenJDK' },
+  { key: 'java.vendor.url', value: 'https://adoptopenjdk.net/' },
+  { key: 'java.vendor.url.bug', value: '' },
+  { key: 'java.version', value: '1.8.0_272' },
 ];
 const encryptedProperty = { key: 'ftp.privateToken', value: 'B9iKAXEeys3G3TcG5ont9dggbtjLAp5v', encryptable: true, encrypted: true };