diff --git a/obuspa/Makefile b/obuspa/Makefile
index 0647eb827..d99aac39c 100644
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=5.0.0.20
+PKG_VERSION:=5.0.0.21
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
diff --git a/obuspa/files/etc/uci-defaults/01-fix-upgrade-uci b/obuspa/files/etc/uci-defaults/01-fix-upgrade-uci
index 2e612522c..a5c3b3031 100644
--- a/obuspa/files/etc/uci-defaults/01-fix-upgrade-uci
+++ b/obuspa/files/etc/uci-defaults/01-fix-upgrade-uci
@@ -5,14 +5,14 @@
 fix_stomp_section() {
 	local encryption
 
-	config_get_bool encryption $1 encryption "1"
-	uci_set obuspa $1 encryption ""
-	uci_set obuspa $1 EnableEncryption "$encryption"
+	config_get_bool encryption $1 encryption ""
+	if [ -n "${encryption}" ]; then
+		uci_set obuspa $1 encryption ""
+		uci_set obuspa $1 EnableEncryption "$encryption"
+	fi
 }
 
-# Copy defaults by the factory to the cwmp UCI user section.
+# fix the stomp encryption parameter
 config_load obuspa
 config_foreach fix_stomp_section stomp
 uci_commit
-
-# No need for commit here, it is done by uci_apply_defaults().