diff --git a/lib/presentation/daily_check_in/daily_check_in_page.dart b/lib/presentation/daily_check_in/daily_check_in_page.dart
index b3e81f0c7..6c912fd08 100644
--- a/lib/presentation/daily_check_in/daily_check_in_page.dart
+++ b/lib/presentation/daily_check_in/daily_check_in_page.dart
@@ -76,6 +76,7 @@ class _DailyCheckInPageState extends State<DailyCheckInPage> {
                   appBar: AppBar(title: Text(s.dailyCheckIn)),
                   url: state.dailyCheckInUrl,
                   hidden: true,
+                  initialChild: const Loading(useScaffold: false),
                 );
               }
               return PageMessage(text: s.noInternetConnection);
diff --git a/lib/presentation/map/map_page.dart b/lib/presentation/map/map_page.dart
index e03fada00..622e896cb 100644
--- a/lib/presentation/map/map_page.dart
+++ b/lib/presentation/map/map_page.dart
@@ -90,9 +90,8 @@ class _MapPageState extends State<MapPage> {
                 userAgent: state.userAgent,
                 ignoreSSLErrors: true,
                 appCacheEnabled: true,
-                initialChild: const Center(
-                  child: CircularProgressIndicator(),
-                ),
+                hidden: true,
+                initialChild: const Loading(useScaffold: false),
               );
             }
             return PageMessage(text: s.noInternetConnection);
diff --git a/lib/presentation/wish_simulator/wish_simulator_page.dart b/lib/presentation/wish_simulator/wish_simulator_page.dart
index ca0eedd16..103b0c865 100644
--- a/lib/presentation/wish_simulator/wish_simulator_page.dart
+++ b/lib/presentation/wish_simulator/wish_simulator_page.dart
@@ -80,6 +80,7 @@ class _WishSimulatorPageState extends State<WishSimulatorPage> {
                 hidden: true,
                 clearCache: true,
                 clearCookies: true,
+                initialChild: const Loading(useScaffold: false),
               );
             }
             return PageMessage(text: s.noInternetConnection);
diff --git a/pubspec.lock b/pubspec.lock
index 764bb2bd0..f80ec7b52 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -367,9 +367,11 @@ packages:
   flutter_webview_plugin:
     dependency: "direct main"
     description:
-      name: flutter_webview_plugin
-      url: "https://pub.dartlang.org"
-    source: hosted
+      path: "."
+      ref: "fix/webview-state-changed"
+      resolved-ref: f8e63c3771f17b4e2287e1a2121e0a0eb5e0f12d
+      url: "git://github.com/micaelcid/flutter_webview_plugin.git"
+    source: git
     version: "0.4.0"
   fluttertoast:
     dependency: "direct main"
diff --git a/pubspec.yaml b/pubspec.yaml
index 44a535d93..2dd56ff42 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -36,7 +36,10 @@ dependencies:
   flutter_slidable: ^0.6.0
   flutter_staggered_grid_view: ^0.4.0
   flutter_user_agentx: ^1.2.4
-  flutter_webview_plugin: ^0.4.0
+  flutter_webview_plugin:
+    git:
+      url: git://github.com/micaelcid/flutter_webview_plugin.git
+      ref: fix/webview-state-changed
   fluttertoast: 8.0.3
   freezed_annotation: ^0.14.2
   get_it: ^7.1.3