diff --git a/src/messenger.cpp b/src/messenger.cpp
index 9e6588e1..91158578 100644
--- a/src/messenger.cpp
+++ b/src/messenger.cpp
@@ -33,7 +33,7 @@ void osd_messenger_t::init()
         for (auto cl_it = clients.begin(); cl_it != clients.end();)
         {
             auto cl = (cl_it++)->second;
-            if (!cl->osd_num)
+            if (!cl->osd_num || cl->peer_state != PEER_CONNECTED)
             {
                 // Do not run keepalive on regular clients
                 continue;