diff --git a/app/server.go b/app/server.go
index 0d03398ee5..46ccb81853 100644
--- a/app/server.go
+++ b/app/server.go
@@ -392,6 +392,7 @@ func NewServer(options ...Option) (*Server, error) {
 		server:   s,
 		handlers: make(map[string]webSocketHandler),
 	}
+	s.WebSocketRouter.app = fakeApp
 
 	if appErr := mailservice.TestConnection(s.Config()); appErr != nil {
 		mlog.Error("Mail server connection test is failed: " + appErr.Message)
diff --git a/app/websocket_router.go b/app/websocket_router.go
index 179382daf1..de77e2c407 100644
--- a/app/websocket_router.go
+++ b/app/websocket_router.go
@@ -26,7 +26,6 @@ func (wr *WebSocketRouter) Handle(action string, handler webSocketHandler) {
 }
 
 func (wr *WebSocketRouter) ServeWebSocket(conn *WebConn, r *model.WebSocketRequest) {
-	wr.app = New(ServerConnector(wr.server))
 	wr.app.InitServer()
 
 	if r.Action == "" {