diff --git a/agent/src/indications.cc b/agent/src/indications.cc
index ad2d5ff..11648dd 100644
--- a/agent/src/indications.cc
+++ b/agent/src/indications.cc
@@ -422,6 +422,12 @@
 }
 
 static void OnuDiscoveryIndication(bcmolt_devid olt, bcmolt_msg *msg) {
+    //Ignore the onu discovery when agent is not connected to VOLTHA
+    if (!state.is_connected()) {
+        bcmolt_msg_free(msg);
+        return;
+    }
+
     openolt::Indication ind;
     openolt::OnuDiscIndication* onu_disc_ind = new openolt::OnuDiscIndication;
     openolt::SerialNumber* serial_number = new openolt::SerialNumber;