diff --git a/org.adempiere.base/src/org/compiere/process/MFAUnregister.java b/org.adempiere.base/src/org/compiere/process/MFAUnregister.java
index 3cc9a058df..4bd263e453 100644
--- a/org.adempiere.base/src/org/compiere/process/MFAUnregister.java
+++ b/org.adempiere.base/src/org/compiere/process/MFAUnregister.java
@@ -31,6 +31,7 @@ import java.sql.Timestamp;
 import java.util.logging.Level;
 
 import org.compiere.model.MMFARegistration;
+import org.compiere.model.PO;
 
 /**
  *	IDEMPIERE-4782
@@ -68,7 +69,12 @@ public class MFAUnregister extends SvrProcess {
 		MMFARegistration reg = new MMFARegistration(getCtx(), p_MFA_Registration_ID, get_TrxName());
 		reg.setIsActive(false);
 		reg.setMFAUnregisteredAt(new Timestamp(System.currentTimeMillis()));
-		reg.saveEx();
+		try {
+			PO.setCrossTenantSafe();
+			reg.saveEx();
+		} finally {
+			PO.clearCrossTenantSafe();
+		}
 
 		return "@OK@";
 	}