diff --git a/src/Object/Post.php b/src/Object/Post.php
index 6e2483c6a0..ba05a168d2 100644
--- a/src/Object/Post.php
+++ b/src/Object/Post.php
@@ -432,6 +432,7 @@ class Post extends BaseObject
 				'delivery_pending'  => L10n::t('Delivery to remote servers is pending'),
 				'delivery_underway' => L10n::t('Delivery to remote servers is underway'),
 				'delivery_almost'   => L10n::t('Delivery to remote servers is mostly done'),
+				'delivery_done'     => L10n::t('Delivery to remote servers is done'),
 			],
 		];
 
diff --git a/view/templates/sub/delivery_count.tpl b/view/templates/sub/delivery_count.tpl
index 6ee4be0fe2..997a0e7d6b 100644
--- a/view/templates/sub/delivery_count.tpl
+++ b/view/templates/sub/delivery_count.tpl
@@ -11,8 +11,10 @@
 		{{$delivery.delivery_pending}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}
 	{{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}
 		{{$delivery.delivery_underway}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}
-	{{else}}
+	{{elseif $delivery.queue_done < $delivery.queue_count}}
 		{{$delivery.delivery_almost}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}
+	{{else}}
+		{{$delivery.delivery_done}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}
 	{{/if}}
 </span>
 {{/if}}
diff --git a/view/theme/frio/templates/sub/delivery_count.tpl b/view/theme/frio/templates/sub/delivery_count.tpl
index 983b49caac..94a0a78802 100644
--- a/view/theme/frio/templates/sub/delivery_count.tpl
+++ b/view/theme/frio/templates/sub/delivery_count.tpl
@@ -10,9 +10,12 @@
 	{{elseif $delivery.queue_done / $delivery.queue_count < 0.75}}
 		<i class="fa fa-paper-plane-o" aria-hidden="true" title="{{$delivery.delivery_underway}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
 		<span class="sr-only">{{$delivery.delivery_underway}}</span>
-	{{else}}
+	{{elseif $delivery.queue_done < $delivery.queue_count}}
 		<i class="fa fa-paper-plane" aria-hidden="true" title="{{$delivery.delivery_almost}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
 		<span class="sr-only">{{$delivery.delivery_almost}}</span>
+	{{else}}
+		<i class="fa fa-paper-plane" aria-hidden="true" title="{{$delivery.delivery_done}} {{$item.delivery.queue_done}}/{{$item.delivery.queue_count}}"></i>
+		<span class="sr-only">{{$delivery.delivery_done}}</span>
 	{{/if}}
 </span>
 {{/if}}