diff --git a/pkg/api/common.go b/pkg/api/common.go
index 4d8b3c28032..28e95866402 100644
--- a/pkg/api/common.go
+++ b/pkg/api/common.go
@@ -87,10 +87,10 @@ func ApiError(status int, message string, err error) *NormalResponse {
 
 	switch status {
 	case 404:
-		resp["message"] = "Not Found"
-		metrics.M_Api_Status_500.Inc(1)
-	case 500:
 		metrics.M_Api_Status_404.Inc(1)
+		resp["message"] = "Not Found"
+	case 500:
+		metrics.M_Api_Status_500.Inc(1)
 		resp["message"] = "Internal Server Error"
 	}
 
diff --git a/pkg/middleware/middleware.go b/pkg/middleware/middleware.go
index 2a6873076c6..e6c2fdbea38 100644
--- a/pkg/middleware/middleware.go
+++ b/pkg/middleware/middleware.go
@@ -197,10 +197,10 @@ func (ctx *Context) JsonApiErr(status int, message string, err error) {
 
 	switch status {
 	case 404:
-		resp["message"] = "Not Found"
-		metrics.M_Api_Status_500.Inc(1)
-	case 500:
 		metrics.M_Api_Status_404.Inc(1)
+		resp["message"] = "Not Found"
+	case 500:
+		metrics.M_Api_Status_500.Inc(1)
 		resp["message"] = "Internal Server Error"
 	}