diff --git a/app/main/views/api_integration.py b/app/main/views/api_integration.py
index 799892c5d..4f3abd346 100644
--- a/app/main/views/api_integration.py
+++ b/app/main/views/api_integration.py
@@ -161,8 +161,8 @@ def api_callbacks(service_id):
 
     return render_template(
         'views/api/callbacks.html',
-        received_text_messages_callback=received_text_messages_callback.get('url', "Not Set"),
-        delivery_status_callback=delivery_status_callback.get('url', "Not Set")
+        received_text_messages_callback=received_text_messages_callback['url'] if received_text_messages_callback else None,
+        delivery_status_callback=delivery_status_callback['url'] if delivery_status_callback else None
     )
 
 
diff --git a/app/templates/views/api/callbacks.html b/app/templates/views/api/callbacks.html
index fb0ac84ab..814bc50c4 100644
--- a/app/templates/views/api/callbacks.html
+++ b/app/templates/views/api/callbacks.html
@@ -1,7 +1,7 @@
 {% extends "withnav_template.html" %}
 {% from "components/textbox.html" import textbox %}
 {% from "components/page-footer.html" import page_footer %}
-{% from "components/table.html" import mapping_table, row, text_field, edit_field %}
+{% from "components/table.html" import mapping_table, row, text_field, edit_field, optional_text_field %}
 
 
 {% block service_page_title %}
@@ -19,13 +19,13 @@
 	  ) %}
 	    {% call row() %}
 	      {{ text_field('Delivery status callback URL') }}
-	      {{ text_field(received_text_messages_callback) }}
+	      {{ optional_text_field(received_text_messages_callback) }}
 	      {{ edit_field('Change', url_for('.delivery_status_callback', service_id=current_service.id)) }}
 	    {% endcall %}
 
 	    {% call row() %}
 	      {{ text_field('Received text messages callback URL') }}
-	      {{ text_field(delivery_status_callback) }}
+	      {{ optional_text_field(delivery_status_callback) }}
 	    	{{ edit_field('Change', url_for('.received_text_messages_callback', service_id=current_service.id)) }}
 	    {% endcall %}
 	  {% endcall %}