diff --git a/main.go b/main.go
index b1676c2f..90d91c57 100644
--- a/main.go
+++ b/main.go
@@ -166,7 +166,7 @@ func streamEvents(w http.ResponseWriter, r *http.Request) {
 
     ctx, cancel := context.WithCancel(context.Background())
     defer cancel()
-    messages, _ := dockerClient.Events(ctx)
+    messages, error := dockerClient.Events(ctx)
 
 Loop:
     for {
@@ -195,6 +195,9 @@ Loop:
         case <-r.Context().Done():
             cancel()
             break Loop
+        case <-error:
+            cancel()
+            break Loop
         }
     }
 }