diff --git a/app/components/task-toast.hbs b/app/components/task-toast.hbs
index f21b865..71c4812 100644
--- a/app/components/task-toast.hbs
+++ b/app/components/task-toast.hbs
@@ -1,4 +1,9 @@
-<Toast @autoClose={{this.autoClose}} @onClose={{@onClose}} @closeIndicatorClass={{this.bg}} as |toast|>
+<Toast
+  @autoClose={{this.autoClose}}
+  @onClose={{@onClose}}
+  @closeIndicatorClass={{this.bg}}
+  as |toast|
+>
   <div class='flex items-center'>
     {{#if this.icon}}
       <div
@@ -9,7 +14,7 @@
     {{/if}}
 
     <div>
-      <div class='mb-2'>Task {{this.taskType}} Uid:{{this.taskUid}}</div>
+      <div class='mb-2'>Task {{this.taskType}} uid:{{this.taskUid}}</div>
       <div class={{if this.task.error 'mb-2'}}>
         Status:
         <span class={{this.color}}>{{this.taskStatus}}</span>
diff --git a/app/components/task-toast.js b/app/components/task-toast.js
index ff3a782..3a2c86b 100644
--- a/app/components/task-toast.js
+++ b/app/components/task-toast.js
@@ -99,8 +99,11 @@ export default class TaskToastComponent extends Component {
     this.meilisearch.getTask(this.taskUid).then((task) => {
       this.task = task;
 
-      if (this.isSucceeded) {
+      if (!this.isEnqueued) {
         this.clearInterval();
+      }
+
+      if (this.isSucceeded) {
         this.autoClose = true;
       }
     });