diff --git a/internal/router/session_manager.go b/internal/router/session_manager.go
index 252ccee..380cdbe 100644
--- a/internal/router/session_manager.go
+++ b/internal/router/session_manager.go
@@ -187,11 +187,9 @@ func (c *Challenger) WS(w http.ResponseWriter, r *http.Request) {
 
 	log.Println(user.Username, remoteAddress, "established new challenge connection!")
 
-	for {
-		select {
-		case <-cancel:
-		case <-conn.Await():
-		}
+	select {
+	case <-cancel:
+	case <-conn.Await():
 	}
 
 }
diff --git a/internal/webserver/resources/static/js/challenge.js b/internal/webserver/resources/static/js/challenge.js
index dfb2404..16aa372 100644
--- a/internal/webserver/resources/static/js/challenge.js
+++ b/internal/webserver/resources/static/js/challenge.js
@@ -34,6 +34,7 @@ function connect() {
                 }));
             return
             case "reset":
+                localStorage.removeItem("challenge")
                 window.location.href = '/'
             return
         }