diff --git a/app/main/views/index.py b/app/main/views/index.py
index 685cb77f9..5e91a7982 100644
--- a/app/main/views/index.py
+++ b/app/main/views/index.py
@@ -81,9 +81,9 @@ def design_content():
 @main.route('/_email')
 def email_template():
     branding_type = 'govuk'
-    branding_style = request.args.get('branding_style', None)
+    branding_style = request.args.get('branding_style', 'None')
 
-    if branding_style:
+    if branding_style != 'None':
         email_branding = email_branding_client.get_email_branding(branding_style)['email_branding']
         branding_type = email_branding['brand_type']
 
diff --git a/app/main/views/service_settings.py b/app/main/views/service_settings.py
index b774f03fc..c3046abbe 100644
--- a/app/main/views/service_settings.py
+++ b/app/main/views/service_settings.py
@@ -971,11 +971,15 @@ def link_service_to_organisation(service_id):
 @user_has_permissions('manage_service')
 def branding_request(service_id):
 
-    email_branding = email_branding_client.get_email_branding(
-        current_service.email_branding)['email_branding']
+    branding_type = 'govuk'
+
+    if current_service.email_branding:
+        email_branding = email_branding_client.get_email_branding(
+            current_service.email_branding)['email_branding']
+        branding_type = email_branding['brand_type']
 
     form = BrandingOptionsEmail(
-        options=email_branding['brand_type']
+        options=branding_type
     )
 
     if form.validate_on_submit():