diff --git a/service/actions/websocket.js b/service/actions/websocket.js
index b60519f89..08c172c52 100644
--- a/service/actions/websocket.js
+++ b/service/actions/websocket.js
@@ -401,7 +401,7 @@ function handleStatusChangedEvent(msg, dispatch, getState) {
 
 function handleHelloEvent(msg) {
     const serverVersion = msg.data.server_version;
-    if (Client.serverVersion !== serverVersion) {
+    if (serverVersion && Client.serverVersion !== serverVersion) {
         Client.serverVersion = serverVersion;
         EventEmitter.emit(Constants.CONFIG_CHANGED, serverVersion);
     }
diff --git a/service/client/client.js b/service/client/client.js
index 799dd840e..a340f28d5 100644
--- a/service/client/client.js
+++ b/service/client/client.js
@@ -721,7 +721,7 @@ export default class Client {
 
         if (headers.has(HEADER_X_VERSION_ID)) {
             const serverVersion = headers.get(HEADER_X_VERSION_ID);
-            if (this.serverVersion !== serverVersion) {
+            if (serverVersion && this.serverVersion !== serverVersion) {
                 this.serverVersion = serverVersion;
                 EventEmitter.emit(Constants.CONFIG_CHANGED, serverVersion);
             }