diff --git a/src/metabase/query_processor/streaming.clj b/src/metabase/query_processor/streaming.clj
index cbd94799f0f84fc097b0d4fb7557615324243723..543a405d45b77a599b6a59f6885f674b8a59de7f 100644
--- a/src/metabase/query_processor/streaming.clj
+++ b/src/metabase/query_processor/streaming.clj
@@ -16,7 +16,8 @@
   (:import
    (clojure.core.async.impl.channels ManyToManyChannel)
    (java.io OutputStream)
-   (metabase.async.streaming_response StreamingResponse)))
+   (metabase.async.streaming_response StreamingResponse)
+   (org.eclipse.jetty.io EofException)))
 
 (set! *warn-on-reflection* true)
 
@@ -139,7 +140,10 @@
     (fn result [result]
       (when (= (:status result) :completed)
         (log/debug "Finished writing results; closing results writer.")
-        (qp.si/finish! results-writer result)
+        (try
+          (qp.si/finish! results-writer result)
+          (catch EofException e
+            (log/error e "Client closed connection prematurely")))
         (u/ignore-exceptions
           (.flush os)
           (.close os)))