diff --git a/src/server/sharedstate_channel.cpp b/src/server/sharedstate_channel.cpp
index e8373314..41ebbe04 100644
--- a/src/server/sharedstate_channel.cpp
+++ b/src/server/sharedstate_channel.cpp
@@ -242,9 +242,10 @@ pva::Monitor::shared_pointer SharedChannel::createMonitor(
         requester->monitorConnect(sts, pvd::MonitorPtr(), pvd::StructureConstPtr());
         ret.reset();
 
-    } else if(notify) {
-        ret->notify();
-
+    } else {
+        if(notify) {
+            ret->notify();
+        }
         if(handler) {
             handler->onFirstConnect(owner);
         }