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