diff --git a/esphome/components/esp32/core.cpp b/esphome/components/esp32/core.cpp
index a9756b41cd..6123d83a34 100644
--- a/esphome/components/esp32/core.cpp
+++ b/esphome/components/esp32/core.cpp
@@ -42,11 +42,11 @@ void arch_init() {
   // Idle task watchdog is disabled on ESP-IDF
 #elif defined(USE_ARDUINO)
   enableLoopWDT();
-  // Disable idle task watchdog on the core we're using (Arduino pins the process to a core)
-#if CONFIG_ARDUINO_RUNNING_CORE == 0
+  // Disable idle task watchdog on the core we're using (Arduino pins the task to a core)
+#if defined(CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU0) && CONFIG_ARDUINO_RUNNING_CORE == 0
   disableCore0WDT();
 #endif
-#if CONFIG_ARDUINO_RUNNING_CORE == 1
+#if defined(CONFIG_ESP_TASK_WDT_CHECK_IDLE_TASK_CPU1) && CONFIG_ARDUINO_RUNNING_CORE == 1
   disableCore1WDT();
 #endif
 #endif
diff --git a/esphome/components/mqtt/mqtt_button.cpp b/esphome/components/mqtt/mqtt_button.cpp
index 25ff327cf9..5f3aaa1dd9 100644
--- a/esphome/components/mqtt/mqtt_button.cpp
+++ b/esphome/components/mqtt/mqtt_button.cpp
@@ -17,7 +17,7 @@ MQTTButtonComponent::MQTTButtonComponent(button::Button *button) : MQTTComponent
 
 void MQTTButtonComponent::setup() {
   this->subscribe(this->get_command_topic_(), [this](const std::string &topic, const std::string &payload) {
-    if (payload == "press") {
+    if (payload == "PRESS") {
       this->button_->press();
     } else {
       ESP_LOGW(TAG, "'%s': Received unknown status payload: %s", this->friendly_name().c_str(), payload.c_str());
@@ -31,6 +31,7 @@ void MQTTButtonComponent::dump_config() {
 }
 
 void MQTTButtonComponent::send_discovery(JsonObject &root, mqtt::SendDiscoveryConfig &config) {
+  config.state_topic = false;
   if (!this->button_->get_device_class().empty())
     root[MQTT_DEVICE_CLASS] = this->button_->get_device_class();
 }
diff --git a/esphome/const.py b/esphome/const.py
index a47d90f401..614288ba51 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2021.12.1"
+__version__ = "2021.12.2"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"