killbill-aplcache

diff --git a/tenant/src/main/java/org/killbill/billing/tenant/api/TenantCacheInvalidation.java b/tenant/src/main/java/org/killbill/billing/tenant/api/TenantCacheInvalidation.java
index 3e2a09f..776e6b1 100644
--- a/tenant/src/main/java/org/killbill/billing/tenant/api/TenantCacheInvalidation.java
+++ b/tenant/src/main/java/org/killbill/billing/tenant/api/TenantCacheInvalidation.java
@@ -189,6 +189,10 @@ public class TenantCacheInvalidation {
                             final BusInternalEvent event;
                             if (tenantKvsTargetRecordId != null) {
                                 final TenantKVModelDao tenantModelDao = tenantDao.getKeyByRecordId(tenantKvsTargetRecordId, tenantContext);
+                                if (tenantModelDao == null) {
+                                    // Probably inactive entry
+                                    continue;
+                                }
                                 event = new DefaultTenantConfigChangeInternalEvent(tenantModelDao.getId(), cur.getType(),
                                                                                    null, tenantContext.getTenantRecordId(), cur.getUserToken());
                             } else {