diff --git a/pkg/api/render.go b/pkg/api/render.go
index be85da35853..65733cfab15 100644
--- a/pkg/api/render.go
+++ b/pkg/api/render.go
@@ -31,11 +31,12 @@ func RenderToPng(c *middleware.Context) {
 
 	pngPath, err := renderer.RenderToPng(renderOpts)
 
-	if err != nil {
-		if err == renderer.ErrTimeout {
-			c.Handle(500, err.Error(), err)
-		}
+	if err != nil && err == renderer.ErrTimeout {
+		c.Handle(500, err.Error(), err)
+		return
+	}
 
+	if err != nil {
 		c.Handle(500, "Rendering failed.", err)
 		return
 	}