diff --git a/emhttp/plugins/dynamix/scripts/xfs_check b/emhttp/plugins/dynamix/scripts/xfs_check
index 1173f4b46..3eafebece 100755
--- a/emhttp/plugins/dynamix/scripts/xfs_check
+++ b/emhttp/plugins/dynamix/scripts/xfs_check
@@ -21,6 +21,11 @@ case "$1" in
 	/sbin/xfs_repair $4 $2 &> /var/lib/xfs/check.status.$3 &
 	pid=$!
 	echo $pid > /var/lib/xfs/check.pid.$3
+	# Capture the exit code once xfs_repair completes
+	{
+		wait $pid
+		echo $? > /var/lib/xfs/check.status.$3.exit
+	} &
 	exit 0
 ;;
 'status')