diff --git a/api/server/server.go b/api/server/server.go
index 0bf33329d0..d1d4cf417c 100644
--- a/api/server/server.go
+++ b/api/server/server.go
@@ -138,7 +138,12 @@ func (s *Server) makeHTTPHandler(handler httputils.APIFunc) http.HandlerFunc {
 		}
 
 		if err := handlerFunc(ctx, w, r, vars); err != nil {
-			logrus.Errorf("Handler for %s %s returned error: %+v", r.Method, r.URL.Path, err)
+			statusCode := httputils.GetHTTPErrorStatusCode(err)
+			errFormat := "%v"
+			if statusCode == http.StatusInternalServerError {
+				errFormat = "%+v"
+			}
+			logrus.Errorf("Handler for %s %s returned error: "+errFormat, r.Method, r.URL.Path, err)
 			httputils.MakeErrorHandler(err)(w, r)
 		}
 	}