diff --git a/src/omnicore/tx.cpp b/src/omnicore/tx.cpp
index 1f966cdcbef56..deb01cce484e2 100644
--- a/src/omnicore/tx.cpp
+++ b/src/omnicore/tx.cpp
@@ -1458,9 +1458,11 @@ int CMPTransaction::logicMath_SendAll()
         return (PKT_ERROR_SEND_ALL -22);
     }
 
-    if (isPropertyNonFungible(property)) {
-        PrintToLog("%s(): rejected: property %d is of type non-fungible\n", __func__, property);
-        return (PKT_ERROR_NFT -21);
+    if (!IsFeatureActivated(FEATURE_NONFUNGIBLE_ISSUER, block)) {
+        if (isPropertyNonFungible(property)) {
+            PrintToLog("%s(): rejected: property %d is of type non-fungible\n", __func__, property);
+            return (PKT_ERROR_NFT -21);
+        }
     }
 
     // ------------------------------------------
@@ -1489,6 +1491,14 @@ int CMPTransaction::logicMath_SendAll()
             continue;
         }
 
+        if (IsFeatureActivated(FEATURE_NONFUNGIBLE_ISSUER, block)) {
+            // do not transfer non-fungible tokens
+            if (isPropertyNonFungible(propertyId)) {
+                PrintToConsole("%s: property %d is non-fungible and will not be included in processing.\n", __func__, propertyId);
+                continue;
+            }
+        }
+
         int64_t moneyAvailable = ptally->getMoney(propertyId, BALANCE);
         if (moneyAvailable > 0) {
             ++numberOfPropertiesSent;