diff --git a/api/application.go b/api/application.go
index c8a1bb65..48bd7b27 100644
--- a/api/application.go
+++ b/api/application.go
@@ -1143,7 +1143,7 @@ func (r *Application) With(m *model.Application, tags []model.ApplicationTag) {
 		})
 		r.Effort = m.Analyses[len(m.Analyses)-1].Effort
 	}
-	r.Risk = assessment.RiskUnknown
+	r.Risk = assessment.RiskUnassessed
 }
 
 //
diff --git a/api/archetype.go b/api/archetype.go
index f647395e..43197683 100644
--- a/api/archetype.go
+++ b/api/archetype.go
@@ -390,7 +390,7 @@ func (r *Archetype) With(m *model.Archetype) {
 		ref.With(m.Review.ID, "")
 		r.Review = ref
 	}
-	r.Risk = assessment.RiskUnknown
+	r.Risk = assessment.RiskUnassessed
 }
 
 //
diff --git a/assessment/pkg.go b/assessment/pkg.go
index 0f995178..8c17c44e 100644
--- a/assessment/pkg.go
+++ b/assessment/pkg.go
@@ -8,10 +8,11 @@ import (
 //
 // Assessment risk
 const (
-	RiskUnknown = "unknown"
-	RiskRed     = "red"
-	RiskYellow  = "yellow"
-	RiskGreen   = "green"
+	RiskUnassessed = "unassessed"
+	RiskUnknown    = "unknown"
+	RiskRed        = "red"
+	RiskYellow     = "yellow"
+	RiskGreen      = "green"
 )
 
 //
@@ -48,26 +49,23 @@ const (
 //
 // Risk returns the single highest risk score for a group of assessments.
 func Risk(assessments []Assessment) (risk string) {
-	risk = RiskUnknown
+	// Return "unassessed" immediately if there are no assessments
 	if len(assessments) == 0 {
-		return
+		return RiskUnassessed
 	}
-	red := 0
-	yellow := 0
-	unknown := 0
-	green := 0
-	if len(assessments) > 0 {
-		for _, a := range assessments {
-			switch a.Risk() {
-			case RiskRed:
-				red++
-			case RiskYellow:
-				yellow++
-			case RiskGreen:
-				green++
-			default:
-				unknown++
-			}
+
+	red, yellow, unknown, green := 0, 0, 0, 0
+
+	for _, a := range assessments {
+		switch a.Risk() {
+		case RiskRed:
+			red++
+		case RiskYellow:
+			yellow++
+		case RiskGreen:
+			green++
+		default:
+			unknown++
 		}
 	}