diff --git a/sysmngr/files/etc/sysmngr/fwbank b/sysmngr/files/etc/sysmngr/fwbank
index c3aa1153a..d9fca5ef4 100755
--- a/sysmngr/files/etc/sysmngr/fwbank
+++ b/sysmngr/files/etc/sysmngr/fwbank
@@ -135,12 +135,16 @@ case "$1" in
 				keep_settings=${keep_settings:-1}
 
 				if command -v "opconf_conf_handler" >/dev/null 2>&1; then
+					if ! mountpoint -q /usr_data; then
+						logger -t sysmngr.fwbank "copy_config: usr_data partition not present"
+						config_scope="All"
+					fi
+
 					arg="-k ${keep_settings}"
 					[ -n  "${keep_opconf}" ] && arg="${arg} -o ${keep_opconf}"
 					[ -n  "${config_scope}" ] && arg="${arg} -s ${config_scope}"
 
 					opconf_conf_handler ${arg}
-					logger -t sysmngr.fwbank ["opconf_conf_handler ${arg}]"
 				else
 					# Fallback to default old behaviour in case opconf not present
 					config_scope="All"
@@ -216,6 +220,11 @@ case "$1" in
 				fi
 
 				if command -v "opconf_conf_handler" >/dev/null 2>&1; then
+					if ! mountpoint -q /usr_data; then
+						logger -t sysmngr.fwbank "upgrade: usr_data partition not present"
+						config_scope="All"
+					fi
+
 					arg="-k ${keep_settings}"
 					[ -n  "${keep_opconf}" ] && arg="${arg} -o ${keep_opconf}"
 					[ -n  "${config_scope}" ] && arg="${arg} -s ${config_scope}"