diff --git a/templates/administrative/assignment/detail.html.twig b/templates/administrative/assignment/detail.html.twig
index 952e909..2a59438 100644
--- a/templates/administrative/assignment/detail.html.twig
+++ b/templates/administrative/assignment/detail.html.twig
@@ -53,7 +53,11 @@
                                     {{ ('label.application.status.' ~ application.status)|trans }}
                                 </td>
                                 <td>
-                                    {{ application.pickup|bpn_pickup_label|default('-') }}
+                                    {% if application.pickup %}
+                                        {{ application.pickup|bpn_pickup_label }}
+                                    {% else %}
+                                        -
+                                    {% endif %}
                                 </td>
                                 <td>
                                     {{ application.requests|default('-')|nl2br }}
@@ -150,7 +154,11 @@
                                 {{ ('label.disposition.status.' ~ disposition.status)|trans }}
                             </td>
                             <td>
-                                {{ disposition.pickup|bpn_pickup_label }}
+                                {% if disposition.pickup %}
+                                    {{ disposition.pickup|bpn_pickup_label }}
+                                {% else %}
+                                    -
+                                {% endif %}
                             </td>
                             <td>
                                 {{ disposition.remarks|default('-')|nl2br }}