diff --git a/lambda/src/main/scala/pricemigrationengine/handlers/NotificationHandler.scala b/lambda/src/main/scala/pricemigrationengine/handlers/NotificationHandler.scala
index b95f95d57..ea3493da4 100644
--- a/lambda/src/main/scala/pricemigrationengine/handlers/NotificationHandler.scala
+++ b/lambda/src/main/scala/pricemigrationengine/handlers/NotificationHandler.scala
@@ -189,9 +189,9 @@ object NotificationHandler extends CohortHandler {
                 // to be able to fill the email template. That distribution is given by the next section.
 
                 // SupporterPlus 2024 extension
-                sp2024_contribution_amount = sp2024ContributionAmountWithCurrencySymbolOpt,
-                sp2024_previous_combined_amount = sp2024PreviousCombinedAmountWithCurrencySymbolOpt,
-                sp2024_new_combined_amount = sp2024NewCombinedAmountWithCurrencySymbolOpt
+                sp2024_contribution_amount = sp2024ContributionAmountWithCurrencySymbolOpt.getOrElse(""),
+                sp2024_previous_combined_amount = sp2024PreviousCombinedAmountWithCurrencySymbolOpt.getOrElse(""),
+                sp2024_new_combined_amount = sp2024NewCombinedAmountWithCurrencySymbolOpt.getOrElse("")
                 // -------------------------------------------------------------
               )
             )
diff --git a/lambda/src/main/scala/pricemigrationengine/model/membershipworkflow/EmailMessage.scala b/lambda/src/main/scala/pricemigrationengine/model/membershipworkflow/EmailMessage.scala
index 22037f5b4..bece64a27 100644
--- a/lambda/src/main/scala/pricemigrationengine/model/membershipworkflow/EmailMessage.scala
+++ b/lambda/src/main/scala/pricemigrationengine/model/membershipworkflow/EmailMessage.scala
@@ -21,9 +21,9 @@ case class EmailPayloadSubscriberAttributes(
     product_type: String,
 
     // SupporterPlus 2024 extension (see comment below)
-    sp2024_contribution_amount: Option[String] = None,
-    sp2024_previous_combined_amount: Option[String] = None,
-    sp2024_new_combined_amount: Option[String] = None,
+    sp2024_contribution_amount: String = "",
+    sp2024_previous_combined_amount: String = "",
+    sp2024_new_combined_amount: String = "",
 )
 
 /*