diff --git a/internal/pkg/common/interfaces.go b/internal/pkg/common/interfaces.go
index cf79c06..eff1cd5 100755
--- a/internal/pkg/common/interfaces.go
+++ b/internal/pkg/common/interfaces.go
@@ -126,6 +126,7 @@
 	CreatePortInCore(context.Context, *voltha.Port) error
 
 	PerOnuFlowHandlerRoutine(uniID uint8)
+	GetDeviceDeleteCommChan(context.Context) chan bool
 }
 
 // IonuDeviceEntry interface to onuDeviceEntry
diff --git a/internal/pkg/core/device_handler.go b/internal/pkg/core/device_handler.go
index 08045c9..c4dd037 100755
--- a/internal/pkg/core/device_handler.go
+++ b/internal/pkg/core/device_handler.go
@@ -4690,6 +4690,10 @@
 	return resp
 }
 
+func (dh *deviceHandler) GetDeviceDeleteCommChan(ctx context.Context) chan bool {
+	return dh.deviceDeleteCommChan
+}
+
 // PrepareForGarbageCollection - remove references to prepare for garbage collection
 func (dh *deviceHandler) PrepareForGarbageCollection(ctx context.Context, aDeviceID string) {
 	logger.Debugw(ctx, "prepare for garbage collection", log.Fields{"device-id": aDeviceID})
diff --git a/internal/pkg/mib/mib_download.go b/internal/pkg/mib/mib_download.go
index ea1ce40..921043a 100755
--- a/internal/pkg/mib/mib_download.go
+++ b/internal/pkg/mib/mib_download.go
@@ -405,5 +405,9 @@
 		// should not happen so far
 		logger.Warnw(ctx, "MibDownload-bridge-init response error", log.Fields{"for device-id": onuDeviceEntry.deviceID})
 		return fmt.Errorf("mibDownloadBridgeInit responseError %s", onuDeviceEntry.deviceID)
+	case <-onuDeviceEntry.baseDeviceHandler.GetDeviceDeleteCommChan(ctx):
+		logger.Warnw(ctx, "Deleting device, do not wait for OMCI response", log.Fields{"device-id": onuDeviceEntry.deviceID})
+		return fmt.Errorf("mibDownloadBridgeInit device deletion in progress! %s", onuDeviceEntry.deviceID)
+
 	}
 }