diff --git a/ycmd/__main__.py b/ycmd/__main__.py
index 512c5974c8..5367eea085 100644
--- a/ycmd/__main__.py
+++ b/ycmd/__main__.py
@@ -203,6 +203,7 @@ def Main():
                                     args.stderr,
                                     args.keep_logfiles )
   atexit.register( handlers.ServerCleanup )
+  handlers.app.uninstall( True )
   handlers.app.install( WatchdogPlugin( args.idle_suicide_seconds,
                                         args.check_interval_seconds ) )
   handlers.app.install( HmacPlugin( hmac_secret ) )