diff --git a/src/Core/Controller.php b/src/Core/Controller.php
index 76b0b45754..e851afd4bd 100644
--- a/src/Core/Controller.php
+++ b/src/Core/Controller.php
@@ -125,6 +125,8 @@ class Controller extends AbstractController implements EventSubscriberInterface
             throw new ClientException(_m('Unsupported format: {format}', ['format' => $format]), 406); // 406 Not Acceptable
         }
 
+        Event::handle('CleanupModule');
+
         return $event;
     }
 
@@ -149,6 +151,9 @@ class Controller extends AbstractController implements EventSubscriberInterface
                 }
             }
         } while ($except != null && ($except = $except->getPrevious()) != null);
+
+        Event::handle('CleanupModule');
+
         return $event;
     }
 
diff --git a/src/Core/GNUsocial.php b/src/Core/GNUsocial.php
index 38fbba46aa..501ef10bb1 100644
--- a/src/Core/GNUsocial.php
+++ b/src/Core/GNUsocial.php
@@ -204,6 +204,7 @@ class GNUsocial implements EventSubscriberInterface
         }
 
         $this->initialize();
+        Event::handle('InitializeModule');
         return $event;
     }