diff --git a/homeassistant/components/homekit/manifest.json b/homeassistant/components/homekit/manifest.json
index 5ec935611f7..887dfc3ee37 100644
--- a/homeassistant/components/homekit/manifest.json
+++ b/homeassistant/components/homekit/manifest.json
@@ -3,7 +3,7 @@
   "name": "HomeKit",
   "documentation": "https://www.home-assistant.io/integrations/homekit",
   "requirements": [
-    "HAP-python==3.5.2",
+    "HAP-python==3.6.0",
     "fnvhash==0.1.0",
     "PyQRCode==1.2.1",
     "base36==0.1.1",
diff --git a/requirements_all.txt b/requirements_all.txt
index 75313a53947..1e469e39839 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -14,7 +14,7 @@ Adafruit-SHT31==1.0.2
 # Adafruit_BBIO==1.1.1
 
 # homeassistant.components.homekit
-HAP-python==3.5.2
+HAP-python==3.6.0
 
 # homeassistant.components.mastodon
 Mastodon.py==1.5.1
diff --git a/requirements_test_all.txt b/requirements_test_all.txt
index 7a49e3faae2..b0c2223e7d2 100644
--- a/requirements_test_all.txt
+++ b/requirements_test_all.txt
@@ -7,7 +7,7 @@
 AEMET-OpenData==0.2.1
 
 # homeassistant.components.homekit
-HAP-python==3.5.2
+HAP-python==3.6.0
 
 # homeassistant.components.flick_electric
 PyFlick==0.0.2
diff --git a/tests/components/homekit/test_type_cameras.py b/tests/components/homekit/test_type_cameras.py
index 354db900470..b9df572a699 100644
--- a/tests/components/homekit/test_type_cameras.py
+++ b/tests/components/homekit/test_type_cameras.py
@@ -696,21 +696,21 @@ async def test_camera_with_linked_doorbell_sensor(hass, run_driver, events):
     char = service.get_characteristic(CHAR_PROGRAMMABLE_SWITCH_EVENT)
     assert char
 
-    assert char.value == 0
+    assert char.value is None
 
     service2 = acc.get_service(SERV_STATELESS_PROGRAMMABLE_SWITCH)
     assert service2
     char2 = service.get_characteristic(CHAR_PROGRAMMABLE_SWITCH_EVENT)
     assert char2
 
-    assert char2.value == 0
+    assert char2.value is None
 
     hass.states.async_set(
         doorbell_entity_id, STATE_OFF, {ATTR_DEVICE_CLASS: DEVICE_CLASS_OCCUPANCY}
     )
     await hass.async_block_till_done()
-    assert char.value == 0
-    assert char2.value == 0
+    assert char.value is None
+    assert char2.value is None
 
     char.set_value(True)
     char2.set_value(True)
@@ -718,8 +718,8 @@ async def test_camera_with_linked_doorbell_sensor(hass, run_driver, events):
         doorbell_entity_id, STATE_ON, {ATTR_DEVICE_CLASS: DEVICE_CLASS_OCCUPANCY}
     )
     await hass.async_block_till_done()
-    assert char.value == 0
-    assert char2.value == 0
+    assert char.value is None
+    assert char2.value is None
 
     # Ensure we do not throw when the linked
     # doorbell sensor is removed
@@ -727,8 +727,8 @@ async def test_camera_with_linked_doorbell_sensor(hass, run_driver, events):
     await hass.async_block_till_done()
     await acc.run()
     await hass.async_block_till_done()
-    assert char.value == 0
-    assert char2.value == 0
+    assert char.value is None
+    assert char2.value is None
 
 
 async def test_camera_with_a_missing_linked_doorbell_sensor(hass, run_driver, events):