diff --git a/voltha/adapters/broadcom_onu/broadcom_onu.py b/voltha/adapters/broadcom_onu/broadcom_onu.py
index 60617ce..1b803e4 100644
--- a/voltha/adapters/broadcom_onu/broadcom_onu.py
+++ b/voltha/adapters/broadcom_onu/broadcom_onu.py
@@ -1359,12 +1359,11 @@
             self.log.info('wait-for-response-exception', exc=str(e))
 
     @inlineCallbacks
-    def message_exchange(self):
+    def message_exchange(self, cvid=BRDCM_DEFAULT_VLAN):
         # reset incoming message queue
         while self.incoming_messages.pending:
             _ = yield self.incoming_messages.get()
 
-        cvid = BRDCM_DEFAULT_VLAN
 
         # construct message
         # MIB Reset - OntData - 0
diff --git a/voltha/adapters/openolt/openolt_device.py b/voltha/adapters/openolt/openolt_device.py
index 77bf289..8921761 100644
--- a/voltha/adapters/openolt/openolt_device.py
+++ b/voltha/adapters/openolt/openolt_device.py
@@ -43,7 +43,7 @@
 import voltha.core.flow_decomposer as fd
 
 import openolt_platform as platform
-from openolt_flow_mgr import OpenOltFlowMgr
+from openolt_flow_mgr import OpenOltFlowMgr, DEFAULT_MGMT_VLAN
 
 MAX_HEARTBEAT_MISS = 3
 HEARTBEAT_PERIOD = 1
@@ -494,7 +494,7 @@
                 # FIXME: that's definitely cheating
                 if onu_device.adapter == 'broadcom_onu':
                     onu_adapter_agent.adapter.devices_handlers[onu_device.id] \
-                            .message_exchange()
+                            .message_exchange(cvid=DEFAULT_MGMT_VLAN)
                     self.log.debug('broadcom-message-exchange-started')
 
             # tcont creation (onu)