diff --git a/config/ui/patches.in b/config/ui/patches.in
index 4d5333b3e8..3658e3d90f 100644
--- a/config/ui/patches.in
+++ b/config/ui/patches.in
@@ -876,8 +876,9 @@ config FREETZ_REMOVE_PUBKEY_INHAUS
 		Removes /etc/avm_firmware_public_key4 or
 		/etc/avm_firmware_public_key3, just 266 bytes.
 
-		Some inhaus firmwares use another file for signature validation,
-		*key4 for router and *key3 for powerline & repeater devices.
+		Some inhaus firmwares use another file for signature validation:
+		 - *key4 for devices with dect (router)
+		 - *key3 for devices without dect (powerline & repeater, except gateway)
 
 config FREETZ_REMOVE_TR069
 	bool "Remove tr069" if FREETZ_SHOW_EXPERT
diff --git a/patches/scripts/265-remove_pubkey.sh b/patches/scripts/265-remove_pubkey.sh
index 0242a6cd18..d8180817e3 100644
--- a/patches/scripts/265-remove_pubkey.sh
+++ b/patches/scripts/265-remove_pubkey.sh
@@ -4,7 +4,7 @@ echo1 "removing public signature"
 file="${FILESYSTEM_MOD_DIR}/etc/avm_firmware_public_key1"
 rm_files "$file"
 
-[ "$FREETZ_TYPE_EXTENDER" == "y" ] && file="3" || file="4"
+[ "$FREETZ_AVM_HAS_DECT" != "y" ] && file="3" || file="4"
 file="${FILESYSTEM_MOD_DIR}/etc/avm_firmware_public_key$file"
 if [ -e "$file" ]; then
 	if [ "$FREETZ_REMOVE_PUBKEY_INHAUS" == "y" ]; then