diff --git a/ui-ngx/src/app/app.module.ts b/ui-ngx/src/app/app.module.ts
index a51fe8205a..0868a2f381 100644
--- a/ui-ngx/src/app/app.module.ts
+++ b/ui-ngx/src/app/app.module.ts
@@ -26,8 +26,6 @@ import { HomeModule } from '@home/home.module';
 import { AppComponent } from './app.component';
 import { DashboardRoutingModule } from '@modules/dashboard/dashboard-routing.module';
 import { RouterModule, Routes } from '@angular/router';
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
-import { EntityConflictInterceptor } from '@shared/interceptors/entity-conflict.interceptor';
 
 const routes: Routes = [
   { path: '**',
@@ -57,9 +55,6 @@ export class PageNotFoundRoutingModule { }
     DashboardRoutingModule,
     PageNotFoundRoutingModule
   ],
-  providers: [
-    { provide: HTTP_INTERCEPTORS, useClass: EntityConflictInterceptor, multi: true }
-  ],
   bootstrap: [AppComponent]
 })
 export class AppModule { }
diff --git a/ui-ngx/src/app/core/core.module.ts b/ui-ngx/src/app/core/core.module.ts
index 032197057e..4b3fb44b12 100644
--- a/ui-ngx/src/app/core/core.module.ts
+++ b/ui-ngx/src/app/core/core.module.ts
@@ -41,6 +41,7 @@ import { WINDOW_PROVIDERS } from '@core/services/window.service';
 import { HotkeyModule } from 'angular2-hotkeys';
 import { TranslateDefaultParser } from '@core/translate/translate-default-parser';
 import { TranslateDefaultLoader } from '@core/translate/translate-default-loader';
+import { EntityConflictInterceptor } from '@core/interceptors/entity-conflict.interceptor';
 
 @NgModule({
   imports: [
@@ -95,6 +96,11 @@ import { TranslateDefaultLoader } from '@core/translate/translate-default-loader
       useClass: GlobalHttpInterceptor,
       multi: true
     },
+    {
+      provide: HTTP_INTERCEPTORS,
+      useClass: EntityConflictInterceptor,
+      multi: true
+    },
     {
       provide: MAT_DIALOG_DEFAULT_OPTIONS,
       useValue: {
diff --git a/ui-ngx/src/app/shared/interceptors/entity-conflict.interceptor.ts b/ui-ngx/src/app/core/interceptors/entity-conflict.interceptor.ts
similarity index 100%
rename from ui-ngx/src/app/shared/interceptors/entity-conflict.interceptor.ts
rename to ui-ngx/src/app/core/interceptors/entity-conflict.interceptor.ts
diff --git a/ui-ngx/src/app/shared/interceptors/public-api.ts b/ui-ngx/src/app/shared/interceptors/public-api.ts
deleted file mode 100644
index 17cbcd22cd..0000000000
--- a/ui-ngx/src/app/shared/interceptors/public-api.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-///
-/// Copyright © 2016-2024 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 './entity-conflict.interceptor';
diff --git a/ui-ngx/src/app/shared/public-api.ts b/ui-ngx/src/app/shared/public-api.ts
index 8207b2e955..bd3d565da3 100644
--- a/ui-ngx/src/app/shared/public-api.ts
+++ b/ui-ngx/src/app/shared/public-api.ts
@@ -19,4 +19,3 @@ export * from './decorators/public-api';
 export * from './models/public-api';
 export * from './pipe/public-api';
 export * from './shared.module';
-export * from './interceptors/public-api';