diff --git a/src/etc/rc.firmware.subr b/src/etc/rc.firmware.subr
index bde5171e8..532a5d0e2 100755
--- a/src/etc/rc.firmware.subr
+++ b/src/etc/rc.firmware.subr
@@ -32,11 +32,6 @@ PIPEFILE="/tmp/pkg_upgrade.pipe"
 RELEASE=$(opnsense-update -vR)
 TEE="/usr/bin/tee -a"
 
-# XXX opnsense-update behaves better in the future
-if [ "${RELEASE}" = "unknown" ]; then
-	RELEASE=
-fi
-
 if [ "${1}" = "upgrade" ]; then
 	: # ok, unconditional major upgrade
 elif [ "${1}" = "ALLOW_RISKY_MAJOR_UPGRADE" -a -n "${RELEASE}" ]; then
diff --git a/src/opnsense/scripts/shell/firmware.sh b/src/opnsense/scripts/shell/firmware.sh
index 0d1d6aff9..cf3988b36 100755
--- a/src/opnsense/scripts/shell/firmware.sh
+++ b/src/opnsense/scripts/shell/firmware.sh
@@ -31,11 +31,6 @@ RELEASE=$(opnsense-update -vR)
 PROMPT="[y/N]"
 ARGS=
 
-# XXX opnsense-update behaves better in the future
-if [ "${RELEASE}" = "unknown" ]; then
-	RELEASE=
-fi
-
 echo -n "Fetching change log information, please wait... "
 if /usr/local/opnsense/scripts/firmware/changelog.sh fetch; then
 	echo "done"