diff --git a/src/ripple/websocket/Handler.h b/src/ripple/websocket/Handler.h
index a66ae328f..6391b2456 100644
--- a/src/ripple/websocket/Handler.h
+++ b/src/ripple/websocket/Handler.h
@@ -365,6 +365,8 @@ public:
         //
         for (int i = 0; i < 3; ++i)
         {
+            if(app_.getJobQueue().isStopping())
+                return;
             boost::optional <std::string> msg = ptr->getMessage ();
             if (! msg)
                 return;