diff --git a/okapi-core/src/main/java/org/folio/okapi/managers/TenantManager.java b/okapi-core/src/main/java/org/folio/okapi/managers/TenantManager.java
index cf80d3002..01ab55713 100644
--- a/okapi-core/src/main/java/org/folio/okapi/managers/TenantManager.java
+++ b/okapi-core/src/main/java/org/folio/okapi/managers/TenantManager.java
@@ -1078,6 +1078,11 @@ private void jobRunPending(Tenant t, ProxyContext pc, TenantInstallOptions optio
         continue;
       }
       ModuleDescriptor md = modsAvailable.get(tm.getId());
+      if (md == null) {
+        logger.info("jobRunPending skips TenantModuleDescriptor id={} "
+            + "because ModuleDescriptor is null", tm.getId());
+        continue;
+      }
       if (options.getDepCheck() && !depsOK(tm, md, getEnabledModules(t))) {
         continue;
       }