diff --git a/src/page_service.rs b/src/page_service.rs
index c79e515c72..e95bee07ab 100644
--- a/src/page_service.rs
+++ b/src/page_service.rs
@@ -453,6 +453,11 @@ impl Connection {
                 info!("query: {:?}", m);
             };
 
+            if message.is_none() {
+                // connection was closed
+                return Ok(());
+            }
+
             match message {
                 Some(FeMessage::ZenithExistsRequest(req)) => {