diff --git a/homeassistant/helpers/entity_component.py b/homeassistant/helpers/entity_component.py
index ec22181bf5a..20be9a0f704 100644
--- a/homeassistant/helpers/entity_component.py
+++ b/homeassistant/helpers/entity_component.py
@@ -39,7 +39,8 @@ class EntityComponent(object):
         self.is_polling = False
 
         self.config = None
-        self.lock = Lock()
+        # Because updating state might cause an entity to be found
+        self.lock = RLock()
 
     def setup(self, config):
         """