diff --git a/pkg/analyze/storage_class.go b/pkg/analyze/storage_class.go
index 2f08cfc7..0912d348 100644
--- a/pkg/analyze/storage_class.go
+++ b/pkg/analyze/storage_class.go
@@ -21,7 +21,11 @@ func analyzeStorageClass(analyzer *troubleshootv1beta2.StorageClass, getCollecte
 
 	title := analyzer.CheckName
 	if title == "" {
-		title = fmt.Sprintf("Storage class %s", analyzer.StorageClassName)
+		if analyzer.StorageClassName != "" {
+			title = fmt.Sprintf("Storage class %s", analyzer.StorageClassName)
+		} else {
+			title = "Default Storage Class"
+		}
 	}
 
 	result := AnalyzeResult{
@@ -31,7 +35,8 @@ func analyzeStorageClass(analyzer *troubleshootv1beta2.StorageClass, getCollecte
 	}
 
 	for _, storageClass := range storageClasses {
-		if storageClass.Name == analyzer.StorageClassName {
+		val, _ := storageClass.Annotations["storageclass.kubernetes.io/is-default-class"]
+		if (storageClass.Name == analyzer.StorageClassName) || (analyzer.StorageClassName == "" && val == "true") {
 			result.IsPass = true
 			for _, outcome := range analyzer.Outcomes {
 				if outcome.Pass != nil {
@@ -39,6 +44,9 @@ func analyzeStorageClass(analyzer *troubleshootv1beta2.StorageClass, getCollecte
 					result.URI = outcome.Pass.URI
 				}
 			}
+			if analyzer.StorageClassName == "" && result.Message == "" {
+				result.Message = "Default Storage Class found"
+			}
 
 			return &result, nil
 		}
@@ -51,6 +59,9 @@ func analyzeStorageClass(analyzer *troubleshootv1beta2.StorageClass, getCollecte
 			result.URI = outcome.Fail.URI
 		}
 	}
+	if analyzer.StorageClassName == "" && result.Message == "" {
+		result.Message = "No Default Storage Class found"
+	}
 
 	return &result, nil
 }