diff --git a/src/main/proxy.ts b/src/main/proxy.ts
index 55be9321f5..1db0ae2aa2 100644
--- a/src/main/proxy.ts
+++ b/src/main/proxy.ts
@@ -156,7 +156,7 @@ export class LensProxy {
       if (proxyTarget) {
         proxy.web(req, res, proxyTarget)
       } else {
-        await this.router.route(cluster, req, res)
+        this.router.route(cluster, req, res)
       }
     })
   }
diff --git a/src/main/router.ts b/src/main/router.ts
index d1a18e389d..d7187e9f9e 100644
--- a/src/main/router.ts
+++ b/src/main/router.ts
@@ -96,8 +96,8 @@ export class Router {
         const type = mimeTypes[path.extname(asset).slice(1)] || "text/plain";
         response.setHeader("Content-Type", type);
         response.write(data)
-        response.end()
       }
+      response.end()
     })
   }
 
diff --git a/src/main/routes/watch.ts b/src/main/routes/watch.ts
index 077d70ce0f..043d3bb7d9 100644
--- a/src/main/routes/watch.ts
+++ b/src/main/routes/watch.ts
@@ -49,16 +49,13 @@ class ApiWatcher {
   }
 
   private doneHandler(error: Error) {
-    if (error) {
-      logger.error("watch error: " + error.toString())
-      this.sendEvent({
-        type: "STREAM_END",
-        url: this.apiUrl,
-        status: 410,
-      })
-      return
-    }
-    this.start()
+    if (error) logger.warn("watch ended: " + error.toString())
+
+    this.sendEvent({
+      type: "STREAM_END",
+      url: this.apiUrl,
+      status: 410,
+    })
   }
 
   private sendEvent(evt: any) {