diff --git a/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend
index 8173b2067..657b70da0 100644
--- a/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/meta-digi-dey/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2018 Digi International.
+# Copyright (C) 2013-2019 Digi International.
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
@@ -34,6 +34,22 @@ pkg_postinst_ontarget_${PN}() {
 			fi
 		done
 	fi
+
+	# Disable file system check when rootfs is encrypted
+	if [ -n "${TRUSTFENCE_INITRAMFS_IMAGE}" ]; then
+		for arg in $(cat /proc/cmdline); do
+			case "${arg}" in
+				root=*) eval ${arg};;
+			esac
+		done
+		# Are we running from NAND
+		if echo "${root}" | grep -qs ubi; then
+			root="/dev/${root}"
+		else
+			root="$(findfs ${root})"
+		fi
+		echo "${root}       /                    auto       defaults              0  0" >> /etc/fstab
+	fi
 }
 
 CONFFILES_${PN} += "${sysconfdir}/sysctl.conf"