diff --git a/drone.go b/drone.go
index 71f39ec2e..fe517f61f 100644
--- a/drone.go
+++ b/drone.go
@@ -33,6 +33,8 @@ func main() {
 	// debug level if requested by user
 	if *debug {
 		logrus.SetLevel(logrus.DebugLevel)
+	} else {
+		logrus.SetLevel(logrus.WarnLevel)
 	}
 
 	// Load the configuration from env file
diff --git a/router/router.go b/router/router.go
index 6d3136461..b44ccb325 100644
--- a/router/router.go
+++ b/router/router.go
@@ -17,7 +17,9 @@ import (
 )
 
 func Load(middleware ...gin.HandlerFunc) http.Handler {
-	e := gin.Default()
+	e := gin.New()
+	e.Use(gin.Recovery())
+
 	e.SetHTMLTemplate(template.Load())
 	e.StaticFS("/static", static.FileSystem())