diff --git a/src/components/ADempiere/Form/VPOS/BusinessPartner/businessPartnersList.vue b/src/components/ADempiere/Form/VPOS/BusinessPartner/businessPartnersList.vue
index 666a1028fdc..19a5349f325 100644
--- a/src/components/ADempiere/Form/VPOS/BusinessPartner/businessPartnersList.vue
+++ b/src/components/ADempiere/Form/VPOS/BusinessPartner/businessPartnersList.vue
@@ -17,7 +17,7 @@
 -->
 <template>
   <el-main
-    v-shortkey="popoverListBusinessParnet ? {close: ['esc'], enter: ['enter']} : {}"
+    v-shortkey="popoverListBusinessParnet ? {close: ['esc']} : {}"
     @shortkey.native="actionList"
   >
     <el-collapse v-model="activeAccordion" accordion>
@@ -206,6 +206,13 @@ export default {
       }
       return this.$store.dispatch('listBPartnerFromServer', values)
         .then(response => {
+          if (this.isEmptyValue(response)) {
+            this.$message({
+              type: 'warning',
+              showClose: true,
+              message: this.$t('businessPartner.notFound')
+            })
+          }
           return response
         })
         .finally(() => {
diff --git a/src/store/modules/ADempiere/businessPartner.js b/src/store/modules/ADempiere/businessPartner.js
index 044eab0a2b1..00fc5007849 100644
--- a/src/store/modules/ADempiere/businessPartner.js
+++ b/src/store/modules/ADempiere/businessPartner.js
@@ -46,7 +46,7 @@ const businessPartner = {
       if (isEmptyValue(pageNumber)) {
         pageNumber = state.businessPartner.pageNumber
         if (isEmptyValue(pageNumber)) {
-          pageNumber = 1 // default page is 1
+          pageNumber = 0 // default page is 1
         }
 
         token = state.businessPartner.token