diff --git a/lib/content-services/src/lib/node-comments/node-comments.component.ts b/lib/content-services/src/lib/node-comments/node-comments.component.ts
index 3ed4b60233..f43f2f74d1 100644
--- a/lib/content-services/src/lib/node-comments/node-comments.component.ts
+++ b/lib/content-services/src/lib/node-comments/node-comments.component.ts
@@ -16,11 +16,17 @@
  */
 
 import { Component, Input, ViewEncapsulation } from '@angular/core';
+import { ADF_COMMENTS_SERVICE } from '@alfresco/adf-core';
+import { NodeCommentsService } from './services/node-comments.service';
 
 @Component({
     selector: 'adf-node-comments',
     templateUrl: './node-comments.component.html',
-    encapsulation: ViewEncapsulation.None
+    encapsulation: ViewEncapsulation.None,
+    providers: [{
+        provide: ADF_COMMENTS_SERVICE,
+        useClass: NodeCommentsService
+    }]
 })
 export class NodeCommentsComponent {
     @Input()
diff --git a/lib/content-services/src/lib/node-comments/node-comments.module.ts b/lib/content-services/src/lib/node-comments/node-comments.module.ts
index 2bc55880c6..8cfd9e8f23 100644
--- a/lib/content-services/src/lib/node-comments/node-comments.module.ts
+++ b/lib/content-services/src/lib/node-comments/node-comments.module.ts
@@ -18,8 +18,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { NodeCommentsComponent } from './node-comments.component';
-import { ADF_COMMENTS_SERVICE, CoreModule } from '@alfresco/adf-core';
-import { NodeCommentsService } from './services/node-comments.service';
+import { CoreModule } from '@alfresco/adf-core';
 
 @NgModule({
     imports: [
@@ -27,12 +26,6 @@ import { NodeCommentsService } from './services/node-comments.service';
         CoreModule
     ],
     declarations: [NodeCommentsComponent],
-    exports: [NodeCommentsComponent],
-    providers: [
-        {
-            provide: ADF_COMMENTS_SERVICE,
-            useClass: NodeCommentsService
-        }
-    ]
+    exports: [NodeCommentsComponent]
 })
 export class NodeCommentsModule {}
diff --git a/lib/process-services/src/lib/task-comments/task-comments.component.ts b/lib/process-services/src/lib/task-comments/task-comments.component.ts
index d2eb095ba7..9f29e6d179 100644
--- a/lib/process-services/src/lib/task-comments/task-comments.component.ts
+++ b/lib/process-services/src/lib/task-comments/task-comments.component.ts
@@ -16,11 +16,17 @@
  */
 
 import { Component, Input, ViewEncapsulation } from '@angular/core';
+import { ADF_COMMENTS_SERVICE } from '@alfresco/adf-core';
+import { TaskCommentsService } from './services/task-comments.service';
 
 @Component({
     selector: 'adf-task-comments',
     templateUrl: './task-comments.component.html',
-    encapsulation: ViewEncapsulation.None
+    encapsulation: ViewEncapsulation.None,
+    providers: [{
+        provide: ADF_COMMENTS_SERVICE,
+        useClass: TaskCommentsService
+    }]
 })
 export class TaskCommentsComponent {
     @Input()
diff --git a/lib/process-services/src/lib/task-comments/task-comments.module.ts b/lib/process-services/src/lib/task-comments/task-comments.module.ts
index f34ccff9a8..f07c543c2a 100644
--- a/lib/process-services/src/lib/task-comments/task-comments.module.ts
+++ b/lib/process-services/src/lib/task-comments/task-comments.module.ts
@@ -18,8 +18,7 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { TaskCommentsComponent } from './task-comments.component';
-import { TaskCommentsService } from './services/task-comments.service';
-import { ADF_COMMENTS_SERVICE, CoreModule } from '@alfresco/adf-core';
+import { CoreModule } from '@alfresco/adf-core';
 
 @NgModule({
     imports: [
@@ -27,12 +26,6 @@ import { ADF_COMMENTS_SERVICE, CoreModule } from '@alfresco/adf-core';
         CoreModule
     ],
     declarations: [TaskCommentsComponent],
-    exports: [TaskCommentsComponent],
-    providers: [
-        {
-            provide: ADF_COMMENTS_SERVICE,
-            useClass: TaskCommentsService
-        }
-    ]
+    exports: [TaskCommentsComponent]
 })
 export class TaskCommentsModule {}