diff --git a/device-common.mk b/device-common.mk
index 9ea275d1..f197763e 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -47,6 +47,10 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Set the max page size to 4096 (b/300367402)
 PRODUCT_MAX_PAGE_SIZE_SUPPORTED := 4096
 
+# Trigger fsck on upgrade (305658663)
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.preventative_fsck = 1
+
 # Indicate that the bootloader supports the MTE developer option switch
 # (MISC_MEMTAG_MODE_MEMTAG_ONCE), with the exception of _fullmte products that
 # force enable MTE.