diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cac6b0..072dc3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,218 +1,7 @@
 # @altiore/twa
 
-## 2.1.5
+## 1.2.4
 
 ### Patch Changes
 
-- 1e3beb1: Update docs
-
-## 2.1.4
-
-### Patch Changes
-
-- f705506: Fix signature bug
-
-## 2.1.3
-
-### Patch Changes
-
-- e4b17fb: Fix types
-
-## 2.1.2
-
-### Patch Changes
-
-- e856e14: Fix bug with types
-
-## 2.3.0
-
-### Minor Changes
-
-- c28cc2e: useWebApp hook
-
-## 2.2.0
-
-### Minor Changes
-
-- 0339c94: Added `useCloudStorage` that provides `CloudStorage` object as Promise functions
-- 1589011: Added useInitData hook
-
-## 2.1.1
-
-### Patch Changes
-
-- 54f5400: Fix smoothButtonsTransition restore state after refresh page
-
-## 2.1.0
-
-### Minor Changes
-
-- bcf3a0e: Added props `disabled` to MainButton component. It is just an alias on the `MainButtonProps.disable`
-  Props `disable` marked as deprecated and will be removed
-
-### Patch Changes
-
-- 05d7b34: - Reduced default value for `smoothButtonsTransitionMs`
-
-## 2.0.1
-
-### Patch Changes
-
-- 24545c3: Fix package missed export types
-
-## 2.0.0
-
-### Major Changes
-
-- 4084742: - Have added unnecessary provider `WebAppProvider`
-  - Fixed all components to works inside `WebAppProvider`
-  - Fix incorrect types `useExpand`
-  - Added `smoothButtonsTransition` options to `WebAppProvider`
-
-### Patch Changes
-
-- 3221966: Support dynamic webApp in context
-- 5e82b6c: Fix documentation format
-- 0bc91cf: Fix structure and types context
-- c402a76: Added documentation for WebAppProvider
-- 4f18299: Describe all WebApp types
-- 111549b: Added jest tests for package and public api
-
-## 1.11.0
-
-### Minor Changes
-
-- af6ccfb: Added useExpand hook, that hook provided isExpanded state, and expand() handle. Remove unsafe_useExpand
-
-## 1.10.1
-
-### Patch Changes
-
-- ef7d3e9: Change readme
-
-## 1.10.0
-
-### Minor Changes
-
-- 8af00e3: Added unsafe_useExpand hook
-
-## 1.9.1
-
-### Patch Changes
-
-- dd8ab05: Update readme
-
-## 1.9.0
-
-### Minor Changes
-
-- 5b1f85f: Added hook useReadTextFromClipboard, that provide function that read text from clipboard
-- 2e16b48: Added hook useSwitchInlineQuery
-
-## 1.8.0
-
-### Minor Changes
-
-- 458e93d: Added docs and demo, describes work useScanQrPopup hook
-
-## 1.7.0
-
-### Minor Changes
-
-- c8b49cf: Added useScanQrPopup hook. This hook provide functions showScanQrPopup, closeScanQrPopup
-
-## 1.6.0
-
-### Minor Changes
-
-- 9ed6405: Add useThemeParams hook
-
-## 1.5.4
-
-### Patch Changes
-
-- 5a248e3: Fix .npmignore paths
-
-## 1.5.3
-
-### Patch Changes
-
-- 7a5106c: Fix MainButton uniq effects
-
-## 1.5.2
-
-### Patch Changes
-
-- 2006b71: Add docst and example with useHapticFeedback
-
-## 1.5.1
-
-### Patch Changes
-
-- 92a21c9: Change interfeces
-
-## 1.5.0
-
-### Minor Changes
-
-- dd146bc: Add useHapticFeedback hook
-
-## 1.4.1
-
-### Patch Changes
-
-- 6a7c5b4: Add CRA demo webapp
-
-## 1.4.0
-
-### Minor Changes
-
-- fdbfcc8: Fix window typed error
-
-## 1.3.0
-
-### Minor Changes
-
-- 28c08e4: Add useShowPopup hook
-
-## 1.2.0
-
-### Minor Changes
-
-- b7bfbcb: Add BackButton component
-
-## 1.1.2
-
-### Patch Changes
-
-- 4e36d80: Update documentation
-
-## 1.1.1
-
-### Patch Changes
-
-- 395c91f: Documentation fix
-
-## 1.1.0
-
-### Minor Changes
-
-- 3f5bd48: Changes types, add documentation
-
-## 1.0.3
-
-### Patch Changes
-
-- 81546ee: Add docs pages
-
-## 1.0.2
-
-### Patch Changes
-
-- 6e8043f: Fix ci files, add README and LICENCE
-
-## 1.0.1
-
-### Patch Changes
-
-- ea7807b: Inited project and added MainButton component
+- 7de1ab9: Fix TwaLoader showPopup issue
diff --git a/README.md b/README.md
index 152c0f3..f25e078 100644
--- a/README.md
+++ b/README.md
@@ -99,9 +99,9 @@ const Content = () => {
 
 Here's what's coming up:
 
-- [ ] In the future, We would like to use us components also in Web application, without Telegram context.
 - [ ] All Telegram WebApp feature support.
 - [x] Main Telegram WebApp feature support.
+- [x] TwaLoader component to better support TWA and non TWA applications
 
 ## 🥂 License
 
diff --git a/package.json b/package.json
index 9d6e6a9..9e718c7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@altiore/twa",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "description": "React components for Telegram WebApp",
   "source": "./src/index.ts",
   "type": "module",
diff --git a/src/TwaLoader.tsx b/src/TwaLoader.tsx
index e4b8758..124bbea 100644
--- a/src/TwaLoader.tsx
+++ b/src/TwaLoader.tsx
@@ -11,6 +11,7 @@ interface IProps {
 	isTWApp?: React.JSX.Element;
 	noTWApp?: React.JSX.Element;
 	minVersion?: string | number;
+	showNotification?: boolean;
 }
 
 export const TwaLoader: FC<IProps> = ({
@@ -18,6 +19,7 @@ export const TwaLoader: FC<IProps> = ({
 	isTWApp = null,
 	noTWApp = null,
 	minVersion = null,
+	showNotification = false,
 }): React.JSX.Element | null => {
 	useEffect(() => {
 		if (!loading && !isTWApp && !noTWApp) {
@@ -38,9 +40,11 @@ export const TwaLoader: FC<IProps> = ({
 
 	useEffect(() => {
 		if (
-			isVersionAtLeast('6.2') &&
+			showNotification &&
+			isLoaded &&
 			minVersion &&
-			parseFloat(minVersion.toString()) > 6.2
+			isVersionAtLeast('6.2') &&
+			!isCorrectVersion
 		) {
 			showPopup({
 				message: `Please update your Telegram app to the latest version to use this app. Minimum supported version is "${minVersion}"`,
@@ -48,7 +52,14 @@ export const TwaLoader: FC<IProps> = ({
 				.then()
 				.catch(console.error);
 		}
-	}, [minVersion, isVersionAtLeast, showPopup]);
+	}, [
+		isVersionAtLeast,
+		showPopup,
+		isLoaded,
+		isCorrectVersion,
+		showNotification,
+		minVersion,
+	]);
 
 	const webApp = useWebApp();