diff --git a/src-db/database/sourcedata/AD_MESSAGE.xml b/src-db/database/sourcedata/AD_MESSAGE.xml
index f6f239656..213dfb063 100644
--- a/src-db/database/sourcedata/AD_MESSAGE.xml
+++ b/src-db/database/sourcedata/AD_MESSAGE.xml
@@ -8645,6 +8645,18 @@ Please contact your system administrator.]]></MSGTEXT>
 <!--9F8239B4DD2F415B87B6285F02C8B79C-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
 <!--9F8239B4DD2F415B87B6285F02C8B79C--></AD_MESSAGE>
 
+<!--9F97B500E4DC4FD3A4B8A05E5534BBE5--><AD_MESSAGE>
+<!--9F97B500E4DC4FD3A4B8A05E5534BBE5-->  <AD_MESSAGE_ID><![CDATA[9F97B500E4DC4FD3A4B8A05E5534BBE5]]></AD_MESSAGE_ID>
+<!--9F97B500E4DC4FD3A4B8A05E5534BBE5-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--9F97B500E4DC4FD3A4B8A05E5534BBE5-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--9F97B500E4DC4FD3A4B8A05E5534BBE5-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--9F97B500E4DC4FD3A4B8A05E5534BBE5-->  <VALUE><![CDATA[OBPOS_NoSafeBoxInformation]]></VALUE>
+<!--9F97B500E4DC4FD3A4B8A05E5534BBE5-->  <MSGTEXT><![CDATA[No Safe Box information loaded. Please try to refresh the application or login again]]></MSGTEXT>
+<!--9F97B500E4DC4FD3A4B8A05E5534BBE5-->  <MSGTYPE><![CDATA[E]]></MSGTYPE>
+<!--9F97B500E4DC4FD3A4B8A05E5534BBE5-->  <AD_MODULE_ID><![CDATA[FF808181326CC34901326D53DBCF0018]]></AD_MODULE_ID>
+<!--9F97B500E4DC4FD3A4B8A05E5534BBE5-->  <ISINCLUDEINI18N><![CDATA[N]]></ISINCLUDEINI18N>
+<!--9F97B500E4DC4FD3A4B8A05E5534BBE5--></AD_MESSAGE>
+
 <!--9FA4146293D24F0ABB2752CCA84A374C--><AD_MESSAGE>
 <!--9FA4146293D24F0ABB2752CCA84A374C-->  <AD_MESSAGE_ID><![CDATA[9FA4146293D24F0ABB2752CCA84A374C]]></AD_MESSAGE_ID>
 <!--9FA4146293D24F0ABB2752CCA84A374C-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/web/org.openbravo.retail.posterminal/js/components/modalsafebox.js b/web/org.openbravo.retail.posterminal/js/components/modalsafebox.js
index c7424b72e..992d78482 100644
--- a/web/org.openbravo.retail.posterminal/js/components/modalsafebox.js
+++ b/web/org.openbravo.retail.posterminal/js/components/modalsafebox.js
@@ -77,6 +77,15 @@ enyo.kind({
     this.inherited(arguments);
   },
   doCheckSafeBox: function() {
+    if (
+      !OB.UTIL.localStorage.getItem('safeBoxes') ||
+      JSON.parse(OB.UTIL.localStorage.getItem('safeBoxes')).length <= 0
+    ) {
+      OB.UTIL.showError(OB.I18N.getLabel('OBPOS_NoSafeBoxInformation'));
+      this.doSkipSafeBox();
+      return;
+    }
+
     const searchKey = this.$.body.$.safeBoxInput.getValue();
     if (_.isEmpty(searchKey)) {
       this.doSkipSafeBox();