diff --git a/mod/admin.php b/mod/admin.php
index 35e43252c..13cf371b0 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -590,6 +590,8 @@ function admin_page_dbsync(&$a) {
 function admin_page_queue($a) {
 	$o = '';
 
+	$expert = ((array_key_exists('expert',$_REQUEST)) ? intval($_REQUEST['expert']) : 0);
+
 	if($_REQUEST['drophub']) {
 		require_once('hubloc.php');
 		hubloc_mark_as_down($_REQUEST['drophub']);
@@ -620,7 +622,8 @@ function admin_page_queue($a) {
 		'$empty' => t('Empty queue for this hub'),
 		'$lastconn' => t('Last known contact'),
 		'$hasentries' => ((count($r)) ? true : false),
-		'$entries' => $r
+		'$entries' => $r,
+		'$expert' => $expert
 	));
 
 	return $o;
diff --git a/view/tpl/admin_queue.tpl b/view/tpl/admin_queue.tpl
index 2abe87db9..6c2df7e31 100644
--- a/view/tpl/admin_queue.tpl
+++ b/view/tpl/admin_queue.tpl
@@ -6,7 +6,7 @@
 
 {{foreach $entries as $e}}
 
-<tr><td>{{$e.total}}</td><td>{{$e.outq_posturl}}</td><td><a href="admin/queue?f=&drophub={{$e.eurl}}" title="{{$nukehub}}" class="btn btn-default"><i class="icon-remove"></i><a></td><td><a href="admin/queue?f=&emptyhub={{$e.eurl}}" title="{{$empty}}" class="btn btn-default"><i class="icon-trash"></i></a></td></tr>
+<tr><td>{{$e.total}}</td><td>{{$e.outq_posturl}}</td>{{if $expert}}<td><a href="admin/queue?f=&drophub={{$e.eurl}}" title="{{$nukehub}}" class="btn btn-default"><i class="icon-remove"></i><a></td><td><a href="admin/queue?f=&emptyhub={{$e.eurl}}" title="{{$empty}}" class="btn btn-default"><i class="icon-trash"></i></a></td>{{/if}}</tr>
 {{/foreach}}
 
 </table>