diff --git a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
index e240bf17c..61354c7c8 100644
--- a/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
+++ b/src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php
@@ -55,7 +55,6 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
         $loader->load('services/controller.yaml');
         $loader->load('services/form.yaml');
         $loader->load('services/templating.yaml');
-        $loader->load('services/notification.yaml');
     }
 
     public function prepend(ContainerBuilder $container)
diff --git a/src/Bundle/ChillActivityBundle/config/services.yaml b/src/Bundle/ChillActivityBundle/config/services.yaml
index 411ad1b5a..86168101a 100644
--- a/src/Bundle/ChillActivityBundle/config/services.yaml
+++ b/src/Bundle/ChillActivityBundle/config/services.yaml
@@ -1,4 +1,4 @@
-services:     
+services:
     chill.activity.security.authorization.activity_voter:
         class: Chill\ActivityBundle\Security\Authorization\ActivityVoter
         arguments:
@@ -6,7 +6,7 @@ services:
         tags:
             - { name: security.voter }
             - { name: chill.role }
-            
+
     chill.activity.security.authorization.activity_stats_voter:
         class: Chill\ActivityBundle\Security\Authorization\ActivityStatsVoter
         arguments:
@@ -14,8 +14,8 @@ services:
         tags:
             - { name: security.voter }
             - { name: chill.role }
-            
-            
+
+
     chill.activity.timeline:
         class: Chill\ActivityBundle\Timeline\TimelineActivityProvider
         arguments:
@@ -33,3 +33,8 @@ services:
         autoconfigure: true
         resource: '../Menu/'
         tags: ['chill.menu_builder']
+
+    Chill\ActivityBundle\Notification\:
+        autowire: true
+        autoconfigure: true
+        resource: '../Notification'
diff --git a/src/Bundle/ChillActivityBundle/config/services/notification.yaml b/src/Bundle/ChillActivityBundle/config/services/notification.yaml
deleted file mode 100644
index 3db168ecd..000000000
--- a/src/Bundle/ChillActivityBundle/config/services/notification.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-services:
-    Chill\ActivityBundle\Notification\ActivityNotificationRenderer:
-        autoconfigure: true
-        autowire: true