diff --git a/routers/repo/milestone.go b/routers/repo/milestone.go
index 3ad638e60a..5b8a5faa33 100644
--- a/routers/repo/milestone.go
+++ b/routers/repo/milestone.go
@@ -253,6 +253,11 @@ func MilestoneIssuesAndPulls(ctx *context.Context) {
 	milestoneID := ctx.ParamsInt64(":id")
 	milestone, err := models.GetMilestoneByID(milestoneID)
 	if err != nil {
+		if models.IsErrMilestoneNotExist(err) {
+			ctx.NotFound("GetMilestoneByID", err)
+			return
+		}
+
 		ctx.ServerError("GetMilestoneByID", err)
 		return
 	}