diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44b5e00c4..7cb4ac228 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,8 @@ All notable changes to this project will be documented in this file.
 - ESP8266 Support for 2MB and up linker files with 1MB and up LittleFS
 - ESP32 support for TLS MQTT using BearSSL (same as ESP8266)
 - Support for 24/26/32/34 bit RFID Wiegand interface (D0/D1) by Sigurd Leuther (#3647)
-- Added ``USE_MQTT_TLS_DROP_OLD_FINGERPRINT`` compile time option to drop old (less secure) TLS fingerprint
+- Compile time option ``USE_MQTT_TLS_DROP_OLD_FINGERPRINT`` to drop old (less secure) TLS fingerprint
+- Command ``SetOption40 0..250`` to disable button functionality if activated for over 0.1 second re-introduced
 
 ### Breaking Changed
 - ESP32 switch from default SPIFFS to default LittleFS file system loosing current (zigbee) files
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 136d679f3..9c1e88528 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -61,6 +61,7 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota
 - Command ``CTRange`` to specify the visible CT range the bulb is capable of [#10311](https://github.com/arendst/Tasmota/issues/10311)
 - Command ``RuleTimer0`` to access all RuleTimers at once [#10352](https://github.com/arendst/Tasmota/issues/10352)
 - Command ``VirtualCT`` to simulate or fine tune CT bulbs with 3,4,5 channels [#10311](https://github.com/arendst/Tasmota/issues/10311)
+- Command ``SetOption40 0..250`` to disable button functionality if activated for over 0.1 second re-introduced
 - Command ``SetOption43 1..255`` to control Rotary step (#10407)
 - Command ``SetOption118 1`` to move ZbReceived from JSON message and into the subtopic replacing "SENSOR" default [#10353](https://github.com/arendst/Tasmota/issues/10353)
 - Command ``SetOption119 1`` to remove the device addr from json payload, can be used with zb_topic_fname where the addr is already known from the topic [#10355](https://github.com/arendst/Tasmota/issues/10355)
@@ -83,6 +84,7 @@ The attached binaries can also be downloaded from http://ota.tasmota.com/tasmota
 - Support character `#` to be replaced by `space`-character in command ``Publish`` topic [#10258](https://github.com/arendst/Tasmota/issues/10258)
 - Basic support for ESP32 Odroid Go 16MB binary tasmota32-odroidgo.bin [#8630](https://github.com/arendst/Tasmota/issues/8630)
 - SPI display driver SSD1331 Color oled by Jeroen Vermeulen [#10376](https://github.com/arendst/Tasmota/issues/10376)
+- Compile time option ``USE_MQTT_TLS_DROP_OLD_FINGERPRINT`` to drop old (less secure) TLS fingerprint
 
 ### Breaking Changed
 - ESP32 switch from default SPIFFS to default LittleFS file system loosing current (zigbee) files
diff --git a/tasmota/support_button.ino b/tasmota/support_button.ino
index 473183665..f1bd22c0f 100644
--- a/tasmota/support_button.ino
+++ b/tasmota/support_button.ino
@@ -263,22 +263,20 @@ void ButtonHandler(void) {
                 SendKey(KEY_BUTTON, button_index +1, POWER_HOLD);  // Execute Hold command via MQTT if ButtonTopic is set
               }
             } else {
-              if (!Settings.flag.button_restrict) {    // SetOption1  - Control button multipress
+              if (Settings.flag.button_restrict) {     // SetOption1 (0) - Control button multipress
+                if (Settings.param[P_HOLD_IGNORE] > 0) {     // SetOption40 (0) - Do not ignore button hold
+                  if (Button.hold_timer[button_index] > loops_per_second * Settings.param[P_HOLD_IGNORE] / 10) {
+                    Button.hold_timer[button_index] = 0;     // Reset button hold counter to stay below hold trigger
+                    Button.press_counter[button_index] = 0;  // Discard button press to disable functionality
+                  }
+                }
+              } else {
                 if ((Button.hold_timer[button_index] == loops_per_second * hold_time_extent * Settings.param[P_HOLD_TIME] / 10)) {  // SetOption32 (40) - Button held for factor times longer
                   Button.press_counter[button_index] = 0;
                   snprintf_P(scmnd, sizeof(scmnd), PSTR(D_CMND_RESET " 1"));
                   ExecuteCommand(scmnd, SRC_BUTTON);
                 }
               }
-              else
-              {
-                if (Settings.param[P_HOLD_IGNORE] > 0) {         // SetOption40 (0) - Do not ignore button hold
-                  if (Button.hold_timer[button_index] > loops_per_second * Settings.param[P_HOLD_IGNORE] / 10) {
-                    Button.hold_timer[button_index] = 0;                // Reset button hold counter to stay below hold trigger
-                    Button.press_counter[button_index] = 0;                // Discard button press to disable functionality
-                  }
-                }
-              }              
             }
           }
         }