diff --git a/src/components/ADempiere/Panel/mainPanelMixin.js b/src/components/ADempiere/Panel/mainPanelMixin.js
index c3257044..c2eb8326 100644
--- a/src/components/ADempiere/Panel/mainPanelMixin.js
+++ b/src/components/ADempiere/Panel/mainPanelMixin.js
@@ -266,11 +266,14 @@ export default {
             recordUuid: route.query.recordUuid,
             referenceUuid: route.query.referenceUuid
           })
+          if (!this.isEmptyValue(referenceInfo)) {
+            parameters.referenceUuid = referenceInfo.uuid
+            parameters.referenceWhereClause = referenceInfo.whereClause
+          }
+
           route.params.isReadParameters = true
           parameters.isLoadAllRecords = false
           parameters.isReference = true
-          parameters.referenceUuid = referenceInfo.uuid
-          parameters.referenceWhereClause = referenceInfo.whereClause
         } else if (route.query.action && route.query.action === 'create-new') {
           parameters.isNewRecord = true
         } else if (route.query.action && route.query.action === 'criteria') {
diff --git a/src/store/modules/ADempiere/windowControl/getters.js b/src/store/modules/ADempiere/windowControl/getters.js
index 9964ffaf..d5104e0c 100644
--- a/src/store/modules/ADempiere/windowControl/getters.js
+++ b/src/store/modules/ADempiere/windowControl/getters.js
@@ -1,3 +1,5 @@
+import { isEmptyValue } from '@/utils/ADempiere/valueUtils.js'
+
 /**
  * Vuex Module, Window Control
  * Getters
@@ -18,6 +20,9 @@ export default {
 
   getReferencesInfo: (state, getters) => ({ windowUuid, recordUuid, referenceUuid }) => {
     const references = getters.getReferencesList(windowUuid, recordUuid)
+    if (isEmptyValue(references)) {
+      return undefined
+    }
     return references.referencesList.find(item => item.uuid === referenceUuid)
   },