diff --git a/src-db/database/model/triggers/M_TRANSACTION_TRG.xml b/src-db/database/model/triggers/M_TRANSACTION_TRG.xml
index fc4ffb091c..3da76ee706 100644
--- a/src-db/database/model/triggers/M_TRANSACTION_TRG.xml
+++ b/src-db/database/model/triggers/M_TRANSACTION_TRG.xml
@@ -215,24 +215,26 @@ BEGIN
     WHERE M_ATTRIBUTESETINSTANCE.M_REFINVENTORY_ID IS NOT NULL
         AND M_ATTRIBUTESETINSTANCE.M_ATTRIBUTESETINSTANCE_ID = :NEW.M_ATTRIBUTESETINSTANCE_ID;
 
-      --If Attribute set instance of M_Transaction is not linked with Handling Unit then fail
-      --when locator has allow storing items as No
+    --If Attribute set instance of M_Transaction is not linked with Handling Unit then fail
+    --when locator has allow storing items as No
     IF (v_allow_storing_items = 'N' AND v_refinventory_id IS NULL) THEN
         RAISE_APPLICATION_ERROR(-20000, '@NonEmptyHUForTransactionAttributeSetInst@'||v_locatorname);
     END IF;
 
-    SELECT COALESCE(COUNT(*), 0) INTO v_count
-        FROM M_LOCATOR_HU_TYPE
-    WHERE M_LOCATOR_ID = :NEW.M_LOCATOR_ID
-        AND m_refinventory_type_id = v_refinventory_type_id;
+    IF (v_refinventory_id IS NOT NULL AND v_hu_type_selection <> 'A') THEN
+      SELECT COALESCE(COUNT(*), 0) INTO v_count
+          FROM M_LOCATOR_HU_TYPE
+      WHERE M_LOCATOR_ID = :NEW.M_LOCATOR_ID
+          AND m_refinventory_type_id = v_refinventory_type_id;
 
       --Check whether handling unit type of handling unit is defined for Locator
       --and its Handling unit selection is set as All excluding defined
       --Check whether handling unit type of handling unit is not defined for Locator
       --and its Handling unit selection is set as Only those defined
-    IF ((v_Count > 0 AND v_hu_type_selection = 'E')
-        OR (v_Count = 0 AND v_hu_type_selection = 'I')) THEN
-        RAISE_APPLICATION_ERROR(-20000, '@NotValidHUTypeForLocator@'||v_locatorname);
+      IF ((v_Count > 0 AND v_hu_type_selection = 'E')
+          OR (v_Count = 0 AND v_hu_type_selection = 'I')) THEN
+            RAISE_APPLICATION_ERROR(-20000, '@NotValidHUTypeForLocator@'||v_locatorname);
+      END IF;
     END IF;
 
     --reset v_count as this is used later on