diff --git a/zmsadmin/templates/block/queue/table.twig b/zmsadmin/templates/block/queue/table.twig
index 18306d7098..07c6209501 100644
--- a/zmsadmin/templates/block/queue/table.twig
+++ b/zmsadmin/templates/block/queue/table.twig
@@ -159,13 +159,13 @@
 								{#DL#}
 								<td>Dieser Kunde ist geparkt</td>
 								{% if workstation.scope.preferences.client.customTextfieldActivated|default(0) == 1 %}
-									<td title="{{ item.customTextfield|decodeEntities }}">
+									<td title="{{ item.customTextfield|decodeEntities }}" class="limited-width">
 										{{ item.customTextfield|decodeEntities|slice(0, textfieldDisplayLength) }}
 										{% if item.customTextfield|decodeEntities|length > textfieldDisplayLength %}...{% endif %}
 									</td>
 								{% endif %}
 								{% if workstation.scope.preferences.client.customTextfield2Activated|default(0) == 1 %}
-									<td title="{{ item.customTextfield2|decodeEntities }}">
+									<td title="{{ item.customTextfield2|decodeEntities }}" class="limited-width">
 										{{ item.customTextfield2|decodeEntities|slice(0, textfieldDisplayLength) }}
 										{% if item.customTextfield2|decodeEntities|length > textfieldDisplayLength %}...{% endif %}
 									</td>
@@ -422,13 +422,13 @@
 										</p>
 									</td>
 									{% if workstation.scope.preferences.client.customTextfieldActivated|default(0) == 1 %}
-										<td title="{{ item.customTextfield|decodeEntities }}">
+										<td title="{{ item.customTextfield|decodeEntities }}" class="limited-width">
 											{{ item.customTextfield|decodeEntities|slice(0, textfieldDisplayLength) }}
 											{% if item.customTextfield|decodeEntities|length > textfieldDisplayLength %}...{% endif %}
 										</td>
 									{% endif %}
 									{% if workstation.scope.preferences.client.customTextfield2Activated|default(0) == 1 %}
-										<td title="{{ item.customTextfield2|decodeEntities }}">
+										<td title="{{ item.customTextfield2|decodeEntities }}" class ="limited-width">
 											{{ item.customTextfield2|decodeEntities|slice(0, textfieldDisplayLength) }}
 											{% if item.customTextfield2|decodeEntities|length > textfieldDisplayLength %}...{% endif %}
 										</td>
@@ -553,13 +553,13 @@
 								{#DL#}
 								<td>Dieser Kunde ist nicht erschienen</td>
 								{% if workstation.scope.preferences.client.customTextfieldActivated|default(0) == 1 %}
-									<td title="{{ item.customTextfield|decodeEntities }}">
+									<td title="{{ item.customTextfield|decodeEntities }}" class="limited-width">
 										{{ item.customTextfield|decodeEntities|slice(0, textfieldDisplayLength) }}
 										{% if item.customTextfield|decodeEntities|length > textfieldDisplayLength %}...{% endif %}
 									</td>
 								{% endif %}
 								{% if workstation.scope.preferences.client.customTextfield2Activated|default(0) == 1 %}
-									<td title="{{ item.customTextfield2|decodeEntities }}">
+									<td title="{{ item.customTextfield2|decodeEntities }}" class="limited-width">
 									{{ item.customTextfield2|decodeEntities|slice(0, textfieldDisplayLength) }}
 									{% if item.customTextfield2|decodeEntities|length > textfieldDisplayLength %}...{% endif %}
 										</td>
@@ -719,4 +719,9 @@ content.addClass('hidden')
         cursor: not-allowed;
         pointer-events: none;
     }
+	.limited-width {
+		overflow-wrap: break-word;
+		hyphens: auto;
+		max-width: 300px;
+	}
 </style>
\ No newline at end of file
diff --git a/zmsdb/src/Zmsdb/Query/Process.php b/zmsdb/src/Zmsdb/Query/Process.php
index ca5d2b2de9..c8b2cd1e75 100644
--- a/zmsdb/src/Zmsdb/Query/Process.php
+++ b/zmsdb/src/Zmsdb/Query/Process.php
@@ -875,15 +875,9 @@ protected function addValuesClientData($process)
         if ($client && $client->offsetExists('notificationsSendCount')) {
             $data['SMSverschickt'] = ('-1' == $client->notificationsSendCount) ? 0 : $client->notificationsSendCount;
         }
-        if ($process->getAmendment()) {
-            $data['Anmerkung'] = $process->getAmendment();
-        }
-        if ($process->getCustomTextfield()) {
-            $data['custom_text_field'] = $process->getCustomTextfield();
-        }
-        if ($process->getCustomTextfield2()) {
-            $data['custom_text_field2'] = $process->getCustomTextfield2();
-        }
+        $data['Anmerkung'] = $process->getAmendment();
+        $data['custom_text_field'] = $process->getCustomTextfield();
+        $data['custom_text_field2'] = $process->getCustomTextfield2();
         $data['zustimmung_kundenbefragung'] = ($client->surveyAccepted) ? 1 : 0;
         $data['Erinnerungszeitpunkt'] = $process->getReminderTimestamp();
         $data['AnzahlPersonen'] = $process->getClients()->count();