diff --git a/server/jsonrpc/jsonrpcserver.cpp b/server/jsonrpc/jsonrpcserver.cpp
index 13723835..f57e1d5d 100644
--- a/server/jsonrpc/jsonrpcserver.cpp
+++ b/server/jsonrpc/jsonrpcserver.cpp
@@ -446,11 +446,11 @@ void JsonRPCServer::registerHandler(JsonHandler *handler)
 
 void JsonRPCServer::clientConnected(const QUuid &clientId)
 {
-    // Notifications disabled by default. Clients must enable them with a valid token
-    m_clients.insert(clientId, false);
-
     TransportInterface *interface = qobject_cast<TransportInterface *>(sender());
 
+    // If authentication is required, notifications are disabled by default. Clients must enable them with a valid token
+    m_clients.insert(clientId, !interface->configuration().authenticationEnabled);
+
     QVariantMap handshake;
     handshake.insert("id", 0);
     handshake.insert("server", "guhIO");