diff --git a/src/kube_cache.rs b/src/kube_cache.rs
index 14e0bd0..96e4cac 100644
--- a/src/kube_cache.rs
+++ b/src/kube_cache.rs
@@ -7,6 +7,7 @@ use kube::{
     Api, Client, ResourceExt,
 };
 use serde_json::json;
+use tokio::task::JoinHandle;
 use tracing::Instrument;
 
 use crate::{
@@ -83,7 +84,7 @@ impl KubeCache {
 #[derive(Clone)]
 pub struct McApi {
     cache: KubeCache,
-    map: Arc<tokio::sync::Mutex<HashMap<String, Server>>>,
+    map: Arc<tokio::sync::Mutex<HashMap<String, JoinHandle<()>>>>,
 }
 
 impl MinecraftAPI<Server> for McApi {
@@ -141,14 +142,23 @@ impl MinecraftAPI<Server> for McApi {
     ) -> Result<(), OpaqueError> {
         let addr = server.get_addr().ok_or("could not get addr of server")?;
         let port = server.get_port().ok_or("could not get port of server")?;
-        if self.map.lock().await.get(&addr).is_none() {
-            let span = tracing::span!(parent: None,tracing::Level::INFO, "server_watcher", addr);
+        let full_addr = format!("{addr}:{port}");
 
-            tokio::spawn(
-                async move {
-                    tracing::info!("starting watch");
+        if let Some(handle) = self.map.lock().await.get(&full_addr) {
+            if !handle.is_finished() {
+                return Ok(());
+            }
+        }
+        let span = tracing::span!(parent: None,tracing::Level::INFO, "server_watcher", addr, port);
+
+        let full_addr_clone = full_addr.clone();
+        let api = self.clone();
+        let handle = tokio::spawn(
+            async move {
+                tracing::info!("starting watcher");
+                loop {
                     tokio::time::sleep(frequency).await;
-                    let server = self.query_server(&addr, &port).await.unwrap();
+                    let server = api.query_server(&addr, &port).await.unwrap();
                     let status_json = match server.query_description().await {
                         Ok(x) => x,
                         Err(e) => {
@@ -166,7 +176,9 @@ impl MinecraftAPI<Server> for McApi {
                         // Otherwise I would need to have it be defined as:
                         // trait StatusTrait: Send { ... }
                         drop(status_json);
-
+                        let mut guard = api.map.lock().await;
+                        guard.remove(&full_addr_clone);
+                        drop(guard);
                         if let Err(err) = server.stop().await {
                             tracing::error!(
                                 trace = err.get_span_trace(),
@@ -177,9 +189,13 @@ impl MinecraftAPI<Server> for McApi {
                         return;
                     }
                 }
-                .instrument(span),
-            );
-        }
+            }
+            .instrument(span),
+        );
+        let mut guard = self.map.lock().await;
+        guard.insert(full_addr.clone(), handle);
+        drop(guard);
+
         Ok(())
     }
 }