diff --git a/api/routes.go b/api/routes.go
index 6c62c4abd5..6af273648d 100644
--- a/api/routes.go
+++ b/api/routes.go
@@ -15,6 +15,7 @@ func (s *Server) RegisterRoutes() {
 	r.Use(middleware.Tracer(s.Tracer))
 	r.Use(middleware.OrgMiddleware(multiTenant))
 	r.Use(middleware.Logger())
+	r.Use(macaron.Recovery())
 	if useGzip {
 		r.Use(gziper.Gziper())
 	}