diff --git a/readthedocs/builds/apps.py b/readthedocs/builds/apps.py
index b7f9f121f46..4485ac819a0 100644
--- a/readthedocs/builds/apps.py
+++ b/readthedocs/builds/apps.py
@@ -17,10 +17,11 @@ def ready(self):
         app.tasks.register(ArchiveBuilds)
 
         try:
-            from readthedocsext.builds.tasks import ShutdownBuilder
+            from readthedocsext.builds.tasks import ShutdownBuilder, StopBuilder
             app.tasks.register(ShutdownBuilder)
+            app.tasks.register(StopBuilder)
         except (ModuleNotFoundError, ImportError):
-            log.info('ShutdownBuilder task could not be imported.')
+            log.info('ShutdownBuilder/StopBuilder task could not be imported.')
 
         try:
             from readthedocsext.monitoring.scaling import AutoscaleBuildersTask