diff --git a/src/ripple/overlay/impl/PeerImp.cpp b/src/ripple/overlay/impl/PeerImp.cpp
index e30ca3b93..754227ff1 100644
--- a/src/ripple/overlay/impl/PeerImp.cpp
+++ b/src/ripple/overlay/impl/PeerImp.cpp
@@ -92,6 +92,9 @@ PeerImp::~PeerImp ()
 void
 PeerImp::run()
 {
+    if(! strand_.running_in_this_thread())
+        return strand_.post(std::bind (
+            &PeerImp::run, shared_from_this()));
     if (m_inbound)
     {
         if (read_buffer_.size() > 0)