diff --git a/models/inventory/StockTransfer.ts b/models/inventory/StockTransfer.ts
index 3deb8b86..bcc97fad 100644
--- a/models/inventory/StockTransfer.ts
+++ b/models/inventory/StockTransfer.ts
@@ -198,6 +198,7 @@ export abstract class StockTransfer extends Transfer {
     await validateBatch(this);
     await validateSerialNumber(this);
     await validateSerialNumberStatus(this);
+    await this._validateHasReturnDocs();
   }
 
   async afterSubmit() {
@@ -207,11 +208,6 @@ export abstract class StockTransfer extends Transfer {
     await this._updateItemsReturned();
   }
 
-  async beforeCancel(): Promise<void> {
-    await super.beforeCancel();
-    await this._validateHasReturnDocs();
-  }
-
   async afterCancel(): Promise<void> {
     await super.afterCancel();
     await updateSerialNumbers(this, true, this.isReturn);
@@ -293,7 +289,7 @@ export abstract class StockTransfer extends Transfer {
   }
 
   async _validateHasReturnDocs() {
-    if (!this.name) {
+    if (!this.name || !this.isCancelled) {
       return;
     }