diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocket.java b/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocket.java
index 4d01f8c..61f8015 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocket.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/UiWebSocket.java
@@ -251,18 +251,18 @@
             ObjectNode message = (ObjectNode) mapper.reader().readTree(data);
             String type = message.path(EVENT).asText(UNKNOWN);
 
-            if (sessionToken == null) {
-                authenticate(type, message);
-
+//            if (sessionToken == null) {
+//                authenticate(type, message);
+//
+//            } else {
+            UiMessageHandler handler = handlers.get(type);
+            if (handler != null) {
+                log.debug("RX message: {}", message);
+                handler.process(message);
             } else {
-                UiMessageHandler handler = handlers.get(type);
-                if (handler != null) {
-                    log.debug("RX message: {}", message);
-                    handler.process(message);
-                } else {
-                    log.warn("No GUI message handler for type {}", type);
-                }
+                log.warn("No GUI message handler for type {}", type);
             }
+//            }
 
         } catch (Exception e) {
             log.warn("Unable to parse GUI message {} due to {}", data, e);
