diff --git a/src/Module/Admin/Queue.php b/src/Module/Admin/Queue.php
index e309bfc647..dafa278e79 100644
--- a/src/Module/Admin/Queue.php
+++ b/src/Module/Admin/Queue.php
@@ -80,6 +80,7 @@ class Queue extends BaseAdmin
 			'$next_try_header' => DI::l10n()->t('Next Try'),
 			'$prio_header' => DI::l10n()->t('Priority'),
 			'$info' => $info,
+			'$status' => $status,
 			'$entries' => $r,
 		]);
 	}
diff --git a/view/templates/admin/queue.tpl b/view/templates/admin/queue.tpl
index c34f92f2cd..5ac38490d3 100644
--- a/view/templates/admin/queue.tpl
+++ b/view/templates/admin/queue.tpl
@@ -8,7 +8,7 @@
 			<th>{{$command_header}}</th>
 			<th>{{$param_header}}</th>
 			<th>{{$created_header}}</th>
-			<th>{{$next_try_header}}</th>
+			{{if ($status==='deferred') }}<th>{{$next_try_header}}</th>{{/if}}
 			<th>{{$prio_header}}</th>
 		</tr>
 		{{foreach $entries as $e}}
@@ -17,7 +17,7 @@
 			<td>{{$e.command}}</td>
 			<td>{{$e.parameter}}</td>
 			<td>{{$e.created}}</td>
-			<td>{{$e.next_try}}</td>
+			{{if ($status==='deferred') }}<td>{{$e.next_try}}</td>{{/if}}
 			<td>{{$e.priority}}</td>
 		</tr>
 		{{/foreach}}
diff --git a/view/theme/frio/templates/admin/queue.tpl b/view/theme/frio/templates/admin/queue.tpl
index 8abc63d2ec..f9aaaa0e96 100644
--- a/view/theme/frio/templates/admin/queue.tpl
+++ b/view/theme/frio/templates/admin/queue.tpl
@@ -8,7 +8,7 @@
 			<th>{{$command_header}}</th>
 			<th>{{$param_header}}</th>
 			<th>{{$created_header}}</th>
-			<th>{{$next_try_header}}</th>
+			{{if ($status==='deferred') }}<th>{{$next_try_header}}</th>{{/if}}
 			<th>{{$prio_header}}</th>
 		</tr>
 		{{foreach $entries as $e}}
@@ -17,7 +17,7 @@
 			<td>{{$e.command}}</td>
 			<td>{{$e.parameter}}</td>
 			<td>{{$e.created}}</td>
-			<td>{{$e.next_try}}</td>
+			{{if ($status==='deferred') }}<td>{{$e.next_try}}</td>{{/if}}
 			<td>{{$e.priority}}</td>
 		</tr>
 		{{/foreach}}