diff --git a/kdumpctl b/kdumpctl
index 94e4f5a..af24971 100755
--- a/kdumpctl
+++ b/kdumpctl
@@ -430,14 +430,51 @@ check_files_modified()
 	return 0
 }
 
-check_dump_fs_modified()
+check_drivers_modified()
+{
+	local _target _new_drivers _old_drivers _module_name _module_filename
+
+	# If it's dump target is on block device, detect the block driver
+	_target=$(get_block_dump_target)
+	if [[ -n "$_target" ]]; then
+		_record_block_drivers() {
+			local _drivers
+			_drivers=$(udevadm info -a "/dev/block/$1" | sed -n 's/\s*DRIVERS=="\(\S\+\)"/\1/p')
+			for _driver in $_drivers; do
+				if ! [[ " $_new_drivers " == *" $_driver "* ]]; then
+					_new_drivers="$_new_drivers $_driver"
+				fi
+			done
+
+			ddebug "MAJ:MIN=$1 drivers='$_drivers'"
+		}
+		check_block_and_slaves_all _record_block_drivers "$(get_maj_min "$_target")"
+	fi
+
+	[ -z "$_new_drivers" ] && return 0
+	_old_drivers="$(lsinitrd $TARGET_INITRD -f /usr/lib/dracut/hostonly-kernel-modules.txt | tr '\n' ' ')"
+
+	ddebug "Modules required for dump target: '$_new_drivers'"
+	ddebug "Modules included in old initramfs: '$_old_drivers'"
+	for _driver in $_new_drivers; do
+		# Skip deprecated/invalid driver name or built-in module
+		_module_name=$(modinfo --set-version "$KDUMP_KERNELVER" -F name $_driver 2>/dev/null)
+		_module_filename=$(modinfo --set-version "$KDUMP_KERNELVER" -n $_driver 2>/dev/null)
+		if [ $? -ne 0 ] || [ -z "$_module_name" ] || [[ "$_module_filename" = *"(builtin)"* ]]; then
+			continue
+		fi
+		if ! [[ " $_old_drivers " == *" $_module_name "* ]]; then
+			dinfo "Detected change in block device driver, new loaded module: $_module_name"
+			return 1
+		fi
+	done
+}
+
+check_fs_modified()
 {
 	local _old_dev _old_mntpoint _old_fstype
 	local _new_dev _new_mntpoint _new_fstype
-	local _target _path _dracut_args
-	local _target_drivers _module_name _module_filename
-
-	local _old_drivers="$(lsinitrd $TARGET_INITRD -f /usr/lib/dracut/hostonly-kernel-modules.txt | tr '\n' ' ')"
+	local _target _dracut_args
 
 	# No need to check in case of mount target specified via "dracut_args".
 	if is_mount_in_dracut_args; then
@@ -450,56 +487,14 @@ check_dump_fs_modified()
 		return 0
 	fi
 
-	_target=$(get_user_configured_dump_disk)
-
-	if [[ -n "$_target" ]]; then
-		_target=$(to_dev_name $_target)
-		_new_fstype=$(blkid $_target | awk -F"TYPE=" '{print $2}' | cut -d '"' -f 2)
-	else
-		_path=$(get_save_path)
-		_target=$(get_target_from_path $_path)
-		_target=$(to_dev_name $_target)
-		_new_fstype=$(get_fs_type_from_target $_target)
-		if [[ -z "$_target" || -z "$_new_fstype" ]];then
-			derror "Dump path $_path does not exist"
-			return 2
-		fi
+	_target=$(get_block_dump_target)
+	_new_fstype=$(get_fs_type_from_target $_target)
+	if [[ -z "$_target" ]] || [[ -z "$_new_fstype" ]];then
+		derror "Dump target is invalid"
+		return 2
 	fi
 
-	ddebug "_target=$_target _path=$_path _new_fstype=$_new_fstype"
-
-	_record_block_drivers() {
-		local _drivers
-
-		if [[ -b /dev/block/$1 ]]; then
-			_drivers=$(udevadm info -a "/dev/block/$1" | sed -n 's/\s*DRIVERS=="\(\S\+\)"/\1/p')
-		fi
-		if [[ -b $1 ]]; then
-			_drivers=$(udevadm info -a "$1" | sed -n 's/\s*DRIVERS=="\(\S\+\)"/\1/p')
-		fi
-		for _driver in $_drivers; do
-			if ! [[ " $_target_drivers " == *" $_driver "* ]]; then
-				_target_drivers="$_target_drivers $_driver"
-			fi
-		done
-		ddebug "MAJ:MIN=$1 _drivers=$_drivers _target_drivers=$_targer_drivers"
-		return 1
-	}
-
-	check_block_and_slaves_all _record_block_drivers "$(get_maj_min "$_target")"
-	for _driver in $_target_drivers; do
-		# Skip deprecated/invalid driver name or built-in module
-		_module_name=$(modinfo --set-version "$KDUMP_KERNELVER" -F name $_driver 2>/dev/null)
-		_module_filename=$(modinfo --set-version "$KDUMP_KERNELVER" -n $_driver 2>/dev/null)
-		if [ $? -ne 0 ] || [ -z "$_module_name" ] || [[ "$_module_filename" = *"(builtin)"* ]]; then
-			continue
-		fi
-		if ! [[ " $_old_drivers " == *" $_module_name "* ]]; then
-			dinfo "Detected change in block device driver, new loaded module: $_module_name"
-			return 1
-		fi
-	done
-
+	ddebug "_target=$_target _new_fstype=$_new_fstype"
 	if [[ $(expr substr $_new_fstype 1 3) = "nfs" ]];then
 		_new_dev=$_target
 	else
@@ -606,7 +601,13 @@ check_system_modified()
 		return $ret
 	fi
 
-	check_dump_fs_modified
+	check_fs_modified
+	ret=$?
+	if [ $ret -ne 0 ]; then
+		return $ret
+	fi
+
+	check_drivers_modified
 	ret=$?
 	if [ $ret -ne 0 ]; then
 		return $ret