diff --git a/packages/admin.gbapp/services/GBAdminService.ts b/packages/admin.gbapp/services/GBAdminService.ts
index ef5aaa99..c8648f8d 100644
--- a/packages/admin.gbapp/services/GBAdminService.ts
+++ b/packages/admin.gbapp/services/GBAdminService.ts
@@ -178,9 +178,10 @@ export class GBAdminService implements IGBAdminService {
   }
   public static async rebuildIndexPackageCommand(min: GBMinInstance, deployer: GBDeployer) {
     const service = await AzureDeployerService.createInstance(deployer);
+    const searchIndex = min.instance.searchIndex ? min.instance.searchIndex : GBServer.globals.minBoot.instance.searchIndex;
     await deployer.rebuildIndex(
       min.instance,
-      service.getKBSearchSchema(min.instance.searchIndex)
+      service.getKBSearchSchema(searchIndex)
     );
   }
 
diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts
index b4c9ec14..f685824e 100644
--- a/packages/kb.gbapp/services/KBService.ts
+++ b/packages/kb.gbapp/services/KBService.ts
@@ -1031,7 +1031,8 @@ export class KBService implements IGBKBService {
     await this.importKbPackage(min, localPath, p, instance);
     GBDeployer.mountGBKBAssets(packageName, min.botId, localPath);
     const service = await AzureDeployerService.createInstance(deployer);
-    await deployer.rebuildIndex(instance, service.getKBSearchSchema(instance.searchIndex));
+    const searchIndex = instance.searchIndex ? instance.searchIndex : GBServer.globals.minBoot.instance.searchIndex;
+    await deployer.rebuildIndex(instance, service.getKBSearchSchema(searchIndex));
 
     min['groupCache'] = await KBService.getGroupReplies(instance.instanceId);
     await KBService.RefreshNER(min);