diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go
index 4e1ca9e..35d2e44 100644
--- a/fsgen/filesystem_creator.go
+++ b/fsgen/filesystem_creator.go
@@ -763,8 +763,9 @@
 	}
 
 	fsProps.Is_auto_generated = proptools.BoolPtr(true)
-	// TODO(b/381120092): Verify mount_point for system partition
-	fsProps.Mount_point = proptools.StringPtr(partitionType)
+	if partitionType != "system" {
+		fsProps.Mount_point = proptools.StringPtr(partitionType)
+	}
 
 	partitionSpecificFsProps(ctx, fsProps, partitionVars, partitionType)