diff --git a/device-common.mk b/device-common.mk
index cbeb2689..ef90ca1a 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -48,3 +48,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Set thermal warm reset
 PRODUCT_PRODUCT_PROPERTIES += \
     ro.thermal_warmreset = true
+
+# Trigger fsck on upgrade (305658663)
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.preventative_fsck = 1
\ No newline at end of file