diff --git a/rpc_shutdown/CHANGELOG.md b/rpc_shutdown/CHANGELOG.md
index 1fe966d..1fac6c1 100644
--- a/rpc_shutdown/CHANGELOG.md
+++ b/rpc_shutdown/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 2.2
+
+- Set delay to zero when it is empty (to not break existing configurations) (bugfix)
+
 ## 2.1
 
 - Set delay to zero when it is empty (to not break existing configurations)
diff --git a/rpc_shutdown/config.json b/rpc_shutdown/config.json
index fcec27c..7d5321c 100644
--- a/rpc_shutdown/config.json
+++ b/rpc_shutdown/config.json
@@ -1,6 +1,6 @@
 {
   "name": "RPC Shutdown",
-  "version": "2.1",
+  "version": "2.2",
   "slug": "rpc_shutdown",
   "description": "Simple way for remote windows shutdowns",
   "url": "https://home-assistant.io/addons/rpc_shutdown/",
diff --git a/rpc_shutdown/run.sh b/rpc_shutdown/run.sh
index 7519789..5a329a8 100755
--- a/rpc_shutdown/run.sh
+++ b/rpc_shutdown/run.sh
@@ -21,7 +21,7 @@ while read -r input; do
         fi
 
         # Check if delay is not empty
-        if bashio::var.is_empty "${DELAY}"; then
+        if bashio::var.equals "$DELAY" "null"; then
             DELAY="0"
         fi