diff --git a/log/context.go b/log/context.go
index b63c602f4..dbf967984 100644
--- a/log/context.go
+++ b/log/context.go
@@ -89,15 +89,15 @@ func SetFormat(format string) error {
 			TimestampFormat: RFC3339NanoFixed,
 			FullTimestamp:   true,
 		})
+		return nil
 	case JSONFormat:
 		logrus.SetFormatter(&logrus.JSONFormatter{
 			TimestampFormat: RFC3339NanoFixed,
 		})
+		return nil
 	default:
 		return fmt.Errorf("unknown log format: %s", format)
 	}
-
-	return nil
 }
 
 // WithLogger returns a new context with the provided logger. Use in