diff --git a/lambda/src/main/scala/pricemigrationengine/handlers/NotificationHandler.scala b/lambda/src/main/scala/pricemigrationengine/handlers/NotificationHandler.scala
index 0ab4e9ea..a6d1ae5d 100644
--- a/lambda/src/main/scala/pricemigrationengine/handlers/NotificationHandler.scala
+++ b/lambda/src/main/scala/pricemigrationengine/handlers/NotificationHandler.scala
@@ -335,7 +335,7 @@ object NotificationHandler extends CohortHandler {
       cohortSpec: CohortSpec,
       contact: SalesforceContact
   ): Either[NotificationHandlerFailure, SalesforceAddress] = {
-    def targetAddressMembership2023(
+    def testCompatibleEmptySalesforceAddress(
         contact: SalesforceContact
     ): Either[NotificationHandlerFailure, SalesforceAddress] = {
       (for {
@@ -348,9 +348,10 @@ object NotificationHandler extends CohortHandler {
     }
 
     MigrationType(cohortSpec) match {
-      case DigiSubs2023            => Right(SalesforceAddress(Some(""), Some(""), Some(""), Some(""), Some("")))
-      case Membership2023Monthlies => targetAddressMembership2023(contact)
-      case Membership2023Annuals   => targetAddressMembership2023(contact)
+      case DigiSubs2023            => testCompatibleEmptySalesforceAddress(contact)
+      case Membership2023Monthlies => testCompatibleEmptySalesforceAddress(contact)
+      case Membership2023Annuals   => testCompatibleEmptySalesforceAddress(contact)
+      case SupporterPlus2024       => testCompatibleEmptySalesforceAddress(contact)
       case _ =>
         (for {
           billingAddress <- requiredField(contact.OtherAddress, "Contact.OtherAddress")