diff --git a/Bot-Utils/Webserver.cs b/Bot-Utils/Webserver.cs
index c105022..7851945 100644
--- a/Bot-Utils/Webserver.cs
+++ b/Bot-Utils/Webserver.cs
@@ -144,7 +144,10 @@ namespace BlubbFish.Utils.IoT.Bots {
     }
 
     public override void Dispose() {
-      this.httplistener.Stop();
+      if(this.httplistener.IsListening) {
+        this.httplistener.Stop();
+      }
+
       this.httplistener.Close();
       if(this.databackend != null) {
         this.databackend.Dispose();