diff --git a/app/main/views/send.py b/app/main/views/send.py
index 25ac708b4..6df72b9bb 100644
--- a/app/main/views/send.py
+++ b/app/main/views/send.py
@@ -357,6 +357,8 @@ def send_one_off_letter_address(service_id, template_id):
 
     db_template = current_service.get_template_with_user_permission_or_403(template_id, current_user)
 
+    session_placeholders = get_normalised_placeholders_from_session()
+
     template = get_template(
         db_template,
         current_service,
@@ -367,14 +369,12 @@ def send_one_off_letter_address(service_id, template_id):
             template_id=template_id,
             filetype='png',
         ),
-        page_count=get_page_count_for_letter(db_template),
+        page_count=get_page_count_for_letter(db_template, session_placeholders),
         email_reply_to=None,
         sms_sender=None
     )
 
-    current_session_address = PostalAddress.from_personalisation(
-        get_normalised_placeholders_from_session()
-    )
+    current_session_address = PostalAddress.from_personalisation(session_placeholders)
 
     form = LetterAddressForm(
         address=current_session_address.normalised,