diff --git a/resources/ts/views/ListView.vue b/resources/ts/views/ListView.vue
index 6bebda3..8e0d222 100644
--- a/resources/ts/views/ListView.vue
+++ b/resources/ts/views/ListView.vue
@@ -25,6 +25,7 @@ import { shareLink } from "@/lib/share";
 const route = useRoute();
 
 const list = ref<string | null>(null);
+const loading = ref<boolean>(true);
 const taskInput = ref<string>("");
 const tasks = ref<Task[]>([]);
 
@@ -54,6 +55,7 @@ function fetchTasks() {
             .then((data: Task[]) => {
                 tasks.value = data;
                 reSortTasks();
+                loading.value = false;
                 setTimeout(fetchTasks, 10000);
             })
             .catch(() => {
@@ -72,7 +74,7 @@ function reSortTasks() {
 }
 
 function onNewTask() {
-    if (taskInput.value.trim() && list.value) {
+    if (taskInput.value.trim() && list.value && !loading.value) {
         createTask(list.value, {
             name: taskInput.value.trim(),
             reset_cron: null,
@@ -179,7 +181,7 @@ onBeforeRouteUpdate((to) => {
             </li>
         </template>
         <li
-            v-if="empty"
+            v-if="!loading && empty"
             class="list-row italic text-xl font-extralight self-center"
         >
             <span
@@ -188,7 +190,7 @@ onBeforeRouteUpdate((to) => {
             ></span>
         </li>
         <li
-            v-else-if="allCompleted && separateCompleted"
+            v-else-if="!loading && allCompleted && separateCompleted"
             class="list-row italic text-xl font-extralight self-center"
         >
             <span
@@ -209,7 +211,7 @@ onBeforeRouteUpdate((to) => {
             <div>
                 <button
                     class="btn btn-square"
-                    :disabled="taskInput.trim().length === 0"
+                    :disabled="loading || taskInput.trim().length === 0"
                     @click="onNewTask"
                 >
                     <circle-plus-icon />