diff --git a/ui-ngx/src/app/core/public-api.ts b/ui-ngx/src/app/core/public-api.ts
index bbf97cde57..cf36240cea 100644
--- a/ui-ngx/src/app/core/public-api.ts
+++ b/ui-ngx/src/app/core/public-api.ts
@@ -18,7 +18,7 @@ export * from './api/public-api';
 export * from './http/public-api';
 export * from './local-storage/local-storage.service';
 export * from './services/public-api';
-export * from './ws/telemetry-websocket.service';
+export * from './ws/public-api';
 export * from './core.state';
 export * from './core.module';
 export * from './utils';
diff --git a/ui-ngx/src/app/core/ws/public-api.ts b/ui-ngx/src/app/core/ws/public-api.ts
new file mode 100644
index 0000000000..d0f5fa8832
--- /dev/null
+++ b/ui-ngx/src/app/core/ws/public-api.ts
@@ -0,0 +1,19 @@
+///
+/// Copyright © 2016-2023 The Thingsboard Authors
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+
+export * from './notification-websocket.service';
+export * from './telemetry-websocket.service';
+export * from './websocket.service';