diff --git a/packages/ui5-tooling-modules/lib/templates/Package.hbs b/packages/ui5-tooling-modules/lib/templates/Package.hbs
index a414090e..c5c88b25 100644
--- a/packages/ui5-tooling-modules/lib/templates/Package.hbs
+++ b/packages/ui5-tooling-modules/lib/templates/Package.hbs
@@ -1,11 +1,13 @@
 {{#if isBaseLib}}
+{{#if scopeSuffix}}
 import "@ui5/webcomponents-base/dist/features/OpenUI5Support.js";
 import { setCustomElementsScopingSuffix } from "@ui5/webcomponents-base/dist/CustomElementsScope.js";
 setCustomElementsScopingSuffix("{{scopeSuffix}}");
+{{/if}}
 
 import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
 import OpenUI5Enablement from "@ui5/webcomponents-base/dist/features/OpenUI5Enablement.js";
-OpenUI5Enablement.enrichBusyIndicatorSettings(UI5Element);
+//OpenUI5Enablement.enrichBusyIndicatorSettings(UI5Element);
 {{/if}}
 
 import { registerEnum } from "sap/ui/base/DataType";