diff --git a/packages/button_pairing_mode.yaml b/packages/button_pairing_mode.yaml
index 6b0bbc8..1f95243 100644
--- a/packages/button_pairing_mode.yaml
+++ b/packages/button_pairing_mode.yaml
@@ -1,10 +1,21 @@
-button:
-  - platform: template
-    name: "${name} Enable Pairing Mode"
-    on_press:
-      - switch.turn_on: download_mode
-      - delay: 5s
-      - switch.turn_off: download_mode
+# Don't use the button component as long as ESPHome 2021.9.3
+# is required because of the buggy esphome-stream-server
+#
+# button:
+#   - platform: template
+#     name: "${name} Enable Pairing Mode"
+#     on_press:
+#       - switch.turn_on: download_mode
+#       - delay: 5s
+#       - switch.turn_off: download_mode
+
+- platform: template
+  id: zigbee_pairing_mode
+  name: "${name} Toggle pairing mode"
+  turn_on_action:
+    - switch.turn_on: download_mode
+    - delay: 5s
+    - switch.turn_off: download_mode
 
 binary_sensor:
   - platform: gpio