diff --git a/counterparty-core/counterpartycore/lib/messages/dispenser.py b/counterparty-core/counterpartycore/lib/messages/dispenser.py
index e1b56e99c..53940fac1 100644
--- a/counterparty-core/counterpartycore/lib/messages/dispenser.py
+++ b/counterparty-core/counterpartycore/lib/messages/dispenser.py
@@ -18,7 +18,6 @@
 from counterpartycore.lib.ledger.currentstate import CurrentState
 from counterpartycore.lib.parser import messagetype, protocol
 from counterpartycore.lib.utils import helpers
-from counterpartycore.lib.utils.address import pack as address_pack_new
 from counterpartycore.lib.utils.address import pack_legacy as address_pack
 from counterpartycore.lib.utils.address import unpack_legacy as address_unpack
 
@@ -247,9 +246,7 @@ def compose(
     oracle_address: str = None,
     skip_validation: bool = False,
 ):
-    if oracle_address is not None and address_pack(oracle_address) != address_pack_new(
-        oracle_address
-    ):
+    if oracle_address is not None and len(oracle_address) > 42:
         raise exceptions.ComposeError("Oracle address not supported by dispenser")
 
     asset_id, problems = validate(
diff --git a/counterparty-core/counterpartycore/lib/messages/versions/mpma.py b/counterparty-core/counterpartycore/lib/messages/versions/mpma.py
index 6b530506d..1b8d363bd 100644
--- a/counterparty-core/counterpartycore/lib/messages/versions/mpma.py
+++ b/counterparty-core/counterpartycore/lib/messages/versions/mpma.py
@@ -126,7 +126,8 @@ def compose(
 
     for send in asset_dest_quant_list:
         destination = send[1]
-        if address.unpack(destination) != address.unpack_legacy(destination):
+
+        if len(destination) > 42:
             raise exceptions.ComposeError(f"Address not supported by MPMA send: {address}")
 
     if memo and not isinstance(memo, str):