diff --git a/templates/admin/index.html.twig b/templates/admin/index.html.twig
index aeeab1d..388137e 100644
--- a/templates/admin/index.html.twig
+++ b/templates/admin/index.html.twig
@@ -153,11 +153,15 @@
                                 {{ icon('feedback', 'w-4 h-4 shrink-0') }}
                                 <div class="flex items-center space-x-1 truncate">
                                     <span class="whitespace-nowrap">{{ feedback.teamer }}</span>
-                                    {% include '_partials/_dot.html.twig' %}
-                                    <span class="whitespace-nowrap">{{ feedback.destinationName }}</span>
+                                    {% if feedback.destinationName %}
+                                        {% include '_partials/_dot.html.twig' %}
+                                        <span class="whitespace-nowrap">{{ feedback.destinationName }}</span>
+                                    {% endif %}
                                 </div>
                             </span>
-                            <span class="pl-5 whitespace-nowrap">{{ feedback.jobProfileName }}</span>
+                            {% if feedback.jobProfileName %}
+                                <span class="pl-5 whitespace-nowrap">{{ feedback.jobProfileName }}</span>
+                            {% endif %}
                         </button>
                     </li>
                 {% else %}
diff --git a/templates/administrative/feedback/modal_info.html.twig b/templates/administrative/feedback/modal_info.html.twig
index 4a2c127..237d16d 100644
--- a/templates/administrative/feedback/modal_info.html.twig
+++ b/templates/administrative/feedback/modal_info.html.twig
@@ -5,10 +5,14 @@
 {% block content %}
     <div class="flex flex-col space-y-4">
         <div class="text-lg">
-            Einsatz: {{ feedback.destinationName }}
-            <br>
-            Einsatzzeitraum: {{ feedback.assignmentDateFrom|date('d.m.Y') }} - {{ feedback.assignmentDateTo|date('d.m.Y') }}
-            <br>
+            {% if feedback.destinationName %}
+                Einsatz: {{ feedback.destinationName }}
+                <br>
+            {% endif %}
+            {% if feedback.assignmentDateFrom and feedback.assignmentDateTo %}
+                Einsatzzeitraum: {{ feedback.assignmentDateFrom|date('d.m.Y') }} - {{ feedback.assignmentDateTo|date('d.m.Y') }}
+                <br>
+            {% endif %}
             Feedback von: {{ feedback.author }}
         </div>
         <table>