diff --git a/VERSION b/VERSION
index ccbccc3..c043eea 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.0
+2.2.1
diff --git a/pyvoltha/adapters/extensions/omci/omci_cc.py b/pyvoltha/adapters/extensions/omci/omci_cc.py
index e86504b..829274b 100644
--- a/pyvoltha/adapters/extensions/omci/omci_cc.py
+++ b/pyvoltha/adapters/extensions/omci/omci_cc.py
@@ -262,7 +262,6 @@
     def max_lp_tx_queue(self):
         return self._max_lp_tx_queue
 
-    @inlineCallbacks
     def _start(self):
         """
         Start the OMCI Communications Channel
@@ -270,9 +269,6 @@
         assert self._enabled, 'Start should only be called if enabled'
         self.flush()
 
-        self._device = yield self._core_proxy.get_device(self._device_id)
-        self._proxy_address = self._device.proxy_address
-
     def _stop(self):
         """
         Stop the OMCI Communications Channel
diff --git a/pyvoltha/adapters/extensions/omci/onu_device_entry.py b/pyvoltha/adapters/extensions/omci/onu_device_entry.py
index 52de1f4..a671620 100644
--- a/pyvoltha/adapters/extensions/omci/onu_device_entry.py
+++ b/pyvoltha/adapters/extensions/omci/onu_device_entry.py
@@ -332,7 +332,7 @@
     # def image_download(self):
     #     return self._image_download
         
-    def start(self):
+    def start(self, device):
         """
         Start the ONU Device Entry state machines
         """
@@ -341,6 +341,8 @@
             return
 
         self._started = True
+        self.omci_cc._device = device
+        self.omci_cc._proxy_address = device.proxy_address
         self._omci_cc.enabled = True
         self._first_in_sync = True
         self._first_capabilities = True
@@ -359,7 +361,7 @@
                 self._state_machines.append(sm)
                 sm.start()
 
-        self._deferred = reactor.callLater(1, start_state_machines,
+        self._deferred = reactor.callLater(0, start_state_machines,
                                            self._on_start_state_machines)
         # Notify any event listeners
         self._publish_device_status_event()