diff --git a/esphome/components/thermostat/climate.py b/esphome/components/thermostat/climate.py
index 7b5ee7c624..20565e811c 100644
--- a/esphome/components/thermostat/climate.py
+++ b/esphome/components/thermostat/climate.py
@@ -431,7 +431,8 @@ async def to_code(config):
 
     heat_cool_mode_available = CONF_HEAT_ACTION in config and CONF_COOL_ACTION in config
     two_points_available = CONF_HEAT_ACTION in config and (
-        CONF_COOL_ACTION in config or CONF_FAN_ONLY_ACTION in config
+        CONF_COOL_ACTION in config
+        or (config[CONF_FAN_ONLY_COOLING] and CONF_FAN_ONLY_ACTION in config)
     )
 
     sens = await cg.get_variable(config[CONF_SENSOR])
diff --git a/esphome/const.py b/esphome/const.py
index e284ee6414..a078ca56a6 100644
--- a/esphome/const.py
+++ b/esphome/const.py
@@ -1,6 +1,6 @@
 """Constants used by esphome."""
 
-__version__ = "2021.12.0b5"
+__version__ = "2021.12.0b6"
 
 ALLOWED_NAME_CHARS = "abcdefghijklmnopqrstuvwxyz0123456789-_"
 
diff --git a/requirements.txt b/requirements.txt
index f7b1a6a1fe..c45797a71f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ pyserial==3.5
 platformio==5.2.2  # When updating platformio, also update Dockerfile
 esptool==3.2
 click==8.0.3
-esphome-dashboard==20211208.0
+esphome-dashboard==20211211.0
 aioesphomeapi==10.6.0
 zeroconf==0.36.13