diff --git a/src/components/modals/frozenAccount/FrozenAccountModal.async.tsx b/src/components/modals/frozenAccount/FrozenAccountModal.async.tsx
index c88166b09..475a564de 100644
--- a/src/components/modals/frozenAccount/FrozenAccountModal.async.tsx
+++ b/src/components/modals/frozenAccount/FrozenAccountModal.async.tsx
@@ -8,7 +8,7 @@ import useModuleLoader from '../../../hooks/useModuleLoader';
 
 const FrozenAccountModalAsync: FC<OwnProps> = (props) => {
   const { modal } = props;
-  const FrozenAccountModal = useModuleLoader(Bundles.Extra, 'FrozenAccountModal', modal);
+  const FrozenAccountModal = useModuleLoader(Bundles.Extra, 'FrozenAccountModal', !modal);
 
   return FrozenAccountModal ? <FrozenAccountModal {...props} /> : undefined;
 };
diff --git a/src/components/modals/stars/StarsPaymentModal.async.tsx b/src/components/modals/stars/StarsPaymentModal.async.tsx
index 6605cc96a..8cb82de39 100644
--- a/src/components/modals/stars/StarsPaymentModal.async.tsx
+++ b/src/components/modals/stars/StarsPaymentModal.async.tsx
@@ -8,7 +8,7 @@ import useModuleLoader from '../../../hooks/useModuleLoader';
 
 const StarPaymentModalAsync: FC<OwnProps> = (props) => {
   const { modal } = props;
-  const StarPaymentModal = useModuleLoader(Bundles.Stars, 'StarPaymentModal', !modal);
+  const StarPaymentModal = useModuleLoader(Bundles.Stars, 'StarPaymentModal', !modal?.inputInvoice);
 
   return StarPaymentModal ? <StarPaymentModal {...props} /> : undefined;
 };
diff --git a/src/components/modals/suggestMessage/SuggestMessageModal.async.tsx b/src/components/modals/suggestMessage/SuggestMessageModal.async.tsx
index 5019ffbc6..98b46252a 100644
--- a/src/components/modals/suggestMessage/SuggestMessageModal.async.tsx
+++ b/src/components/modals/suggestMessage/SuggestMessageModal.async.tsx
@@ -6,13 +6,11 @@ import { Bundles } from '../../../util/moduleLoader';
 
 import useModuleLoader from '../../../hooks/useModuleLoader';
 
-import Loading from '../../ui/Loading';
-
 const SuggestMessageModalAsync: FC<OwnProps> = (props) => {
   const { modal } = props;
   const SuggestMessageModal = useModuleLoader(Bundles.Extra, 'SuggestMessageModal', !modal);
 
-  return SuggestMessageModal ? <SuggestMessageModal {...props} /> : <Loading />;
+  return SuggestMessageModal ? <SuggestMessageModal {...props} /> : undefined;
 };
 
 export default SuggestMessageModalAsync;
diff --git a/src/components/modals/suggestedPostApproval/SuggestedPostApprovalModal.async.tsx b/src/components/modals/suggestedPostApproval/SuggestedPostApprovalModal.async.tsx
index 9fb82b86a..4c99a9495 100644
--- a/src/components/modals/suggestedPostApproval/SuggestedPostApprovalModal.async.tsx
+++ b/src/components/modals/suggestedPostApproval/SuggestedPostApprovalModal.async.tsx
@@ -6,13 +6,11 @@ import { Bundles } from '../../../util/moduleLoader';
 
 import useModuleLoader from '../../../hooks/useModuleLoader';
 
-import Loading from '../../ui/Loading';
-
 const SuggestedPostApprovalModalAsync: FC<OwnProps> = (props) => {
   const { modal } = props;
   const SuggestedPostApprovalModal = useModuleLoader(Bundles.Extra, 'SuggestedPostApprovalModal', !modal);
 
-  return SuggestedPostApprovalModal ? <SuggestedPostApprovalModal {...props} /> : <Loading />;
+  return SuggestedPostApprovalModal ? <SuggestedPostApprovalModal {...props} /> : undefined;
 };
 
 export default SuggestedPostApprovalModalAsync;
diff --git a/src/components/modals/webApp/WebAppModal.async.tsx b/src/components/modals/webApp/WebAppModal.async.tsx
index 5cf7f6a50..d4e346b5a 100644
--- a/src/components/modals/webApp/WebAppModal.async.tsx
+++ b/src/components/modals/webApp/WebAppModal.async.tsx
@@ -8,7 +8,7 @@ import useModuleLoader from '../../../hooks/useModuleLoader';
 
 const WebAppModalAsync: FC<OwnProps> = (props) => {
   const { modal } = props;
-  const WebAppModal = useModuleLoader(Bundles.Extra, 'WebAppModal', !modal);
+  const WebAppModal = useModuleLoader(Bundles.Extra, 'WebAppModal', !modal?.isModalOpen);
 
   return WebAppModal ? <WebAppModal {...props} /> : undefined;
 };
diff --git a/src/hooks/useModuleLoader.ts b/src/hooks/useModuleLoader.ts
index 55426ef37..abe48c87b 100644
--- a/src/hooks/useModuleLoader.ts
+++ b/src/hooks/useModuleLoader.ts
@@ -2,6 +2,7 @@ import { useEffect } from '../lib/teact/teact';
 
 import type { BundleModules, Bundles } from '../util/moduleLoader';
 
+import { DEBUG } from '../config';
 import { addLoadListener, getModuleFromMemory, loadModule } from '../util/moduleLoader';
 import useForceUpdate from './useForceUpdate';
 
@@ -21,6 +22,10 @@ const useModuleLoader = <B extends Bundles, M extends BundleModules<B>>(
 
   useEffect(() => {
     if (!noLoad && !module) {
+      if (DEBUG) {
+        // eslint-disable-next-line no-console
+        console.log('Module load triggered', bundleName, moduleName);
+      }
       loadModule(bundleName).then(forceUpdate);
     }
   }, [bundleName, forceUpdate, module, moduleName, noLoad]);