diff --git a/pkg/apis/helm/v1beta1/generic_hash.go b/pkg/apis/helm/v1beta1/generic_hash.go
index 5c2d32a5c285..622881185552 100644
--- a/pkg/apis/helm/v1beta1/generic_hash.go
+++ b/pkg/apis/helm/v1beta1/generic_hash.go
@@ -38,6 +38,10 @@ func cleanUpInterfaceMap(in map[string]interface{}) map[string]interface{} {
 
 // Cleans up the value in the map, recurses in case of arrays and maps
 func cleanUpMapValue(v interface{}) interface{} {
+	// Keep null values as nil to avoid type mismatches
+	if v == nil {
+		return nil
+	}
 	switch v := v.(type) {
 	case []interface{}:
 		return cleanUpInterfaceArray(v)