diff --git a/app/pages/waiting.vue b/app/pages/waiting.vue
index 5ac2fca..211c614 100644
--- a/app/pages/waiting.vue
+++ b/app/pages/waiting.vue
@@ -1,66 +1,96 @@
 <template>
   <div class="page-wrapper">
     <div class="waiting-container">
-        <h2>Container Status: {{ status }}</h2>
-        <p v-if="status === 'ready'">
+      <h2>Container Status: {{ status }}</h2>
+      <p v-if="status === 'ready'">
         Your container is ready! <a :href="`http://${ip}`" target="_blank">Open it</a>
-        </p>
-        <p v-else-if="status === 'running'">Waiting for services to be ready...</p>
-        <p v-else-if="status === 'starting'">Starting container...</p>
-        <p v-else-if="status === 'error'" class="error-text">{{ errorMessage }}</p>
+      </p>
+      <p v-else-if="status === 'running'">Waiting for services to be ready...</p>
+      <p v-else-if="status === 'starting'">Starting container...</p>
+      <p v-else-if="status === 'error'" class="error-text">{{ errorMessage }}</p>
     </div>
     <Spinner :loading="loading" />
   </div>
 </template>
 
 <script setup>
-import { useRoute, useRouter } from 'vue-router';
+import { ref, onMounted, onUnmounted } from 'vue'        // <— sicher importieren
+import { useRoute, useRouter } from 'vue-router'
 
-const route = useRoute();
-const router = useRouter();
-const name = route.query.name;
-const redirect = route.query.redirect;
-const loading = ref(true);
-const status = ref('starting');
-const ip = ref(null);
-const interval = ref(null);
-const errorMessage = ref(null);
+const route = useRoute()
+const router = useRouter()
+const name = route.query.name
+const redirect = route.query.redirect
+
+const loading = ref(true)
+const status = ref('starting')
+const ip = ref(null)
+const interval = ref(null)
+const errorMessage = ref(null)
+
+const POLL_MS = 3000
 
 const checkStatus = async () => {
   try {
-    const res = await $fetch(`${window.location.origin}/api/status?name=${name}`);
-    status.value = res.status;
-    if (interval.value) {
-      clearInterval(interval.value);
-    }
+    const res = await $fetch(`${window.location.origin}/api/status?name=${name}`, {
+      method: 'GET',
+      cache: 'no-store' // Browser-Cache umgehen
+    })
+
+    status.value = res.status
+    ip.value = res.ip ?? ip.value
+
+    // Optional: wenn der Container "aus" ist, hier Start triggern (API abhängig)
+    // if (res.status === 'stopped' || res.status === 'not_found') {
+    //   await $fetch(`${window.location.origin}/api/start?name=${name}`, { method: 'POST' })
+    //   status.value = 'starting'
+    // }
+
     if (res.status === 'ready') {
-      ip.value = res.ip;
-      // Redirect or show login link
-      window.location.href= 'http://'+ window.location.host;
+      // Polling nur bei success beenden
+      if (interval.value) clearInterval(interval.value)
+
+      loading.value = false
+      ip.value = res.ip
+
+      // Redirect-Logik: wenn redirect gesetzt -> dahin; sonst zur Root oder zur IP
+      if (redirect) {
+        window.location.href = redirect.toString();
+      } else {
+        // Entweder auf die IP oder auf die Host-Root
+        // window.location.href = `http://${ip.value}`
+        window.location.href = `http://${window.location.host}`
+      }
+    } else {
+      // solange nicht ready: weiterladen anzeigen
+      loading.value = true
     }
   } catch (error) {
-    loading.value = false;
-    status.value = 'error';
-    errorMessage.value = error?.data?.message || 'Internal server error!';
-    clearInterval(interval.value);
-    setTimeout( () => {
-        router.replace(`/app/?auth=ok&redirect=${redirect}`);
-    }, 5000);
-    
+    loading.value = false
+    status.value = 'error'
+    errorMessage.value = error?.data?.message || 'Internal server error!'
+
+    if (interval.value) clearInterval(interval.value)
+
+    // nach kurzer Pause zurück zur App (Redirect-Param übernehmen)
+    setTimeout(() => {
+      router.replace(`/app/?auth=ok&redirect=${redirect ?? ''}`)
+    }, 5000)
   }
-};
+}
 
 onMounted(() => {
-  checkStatus();
-  interval.value = setInterval(checkStatus, 3000); // Poll every 3s
-});
+  checkStatus()
+  // WICHTIG: Intervall NICHT im checkStatus selbst löschen,
+  // sondern nur bei ready/error oder beim Unmount.
+  interval.value = setInterval(checkStatus, POLL_MS)
+})
 
 onUnmounted(() => {
-  if (interval.value) {
-    clearInterval(interval.value);
-  }
-});
+  if (interval.value) clearInterval(interval.value)
+})
 </script>
+
 <style scoped>
 .waiting-container {
   max-width: 100%;
@@ -71,6 +101,5 @@ onUnmounted(() => {
   background: #f9fafb;
   box-shadow: 0 4px 10px rgb(0 0 0 / 0.1);
 }
-</style>
-
-
+.error-text { color: #b91c1c; }
+</style> 
\ No newline at end of file