diff --git a/Pixiview.Android/Properties/AndroidManifest.xml b/Pixiview.Android/Properties/AndroidManifest.xml
index d850bfa..f177278 100644
--- a/Pixiview.Android/Properties/AndroidManifest.xml
+++ b/Pixiview.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.520" package="org.tsanie.pixiview" android:versionCode="9">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0.521" package="org.tsanie.pixiview" android:versionCode="10">
 	<uses-sdk android:minSdkVersion="25" android:targetSdkVersion="28" />
 	<application android:label="Pixiview" android:icon="@mipmap/icon" android:roundIcon="@mipmap/icon_round"></application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/Pixiview.iOS.OpenExtension/Info.plist b/Pixiview.iOS.OpenExtension/Info.plist
index 6b3226c..d494c1a 100644
--- a/Pixiview.iOS.OpenExtension/Info.plist
+++ b/Pixiview.iOS.OpenExtension/Info.plist
@@ -29,8 +29,8 @@
 		<string>com.apple.share-services</string>
 	</dict>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.520</string>
+	<string>1.0.521</string>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>10</string>
 </dict>
 </plist>
diff --git a/Pixiview.iOS/Info.plist b/Pixiview.iOS/Info.plist
index 42b1a82..3054001 100644
--- a/Pixiview.iOS/Info.plist
+++ b/Pixiview.iOS/Info.plist
@@ -79,8 +79,8 @@
 		</dict>
 	</array>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.520</string>
+	<string>1.0.521</string>
 	<key>CFBundleVersion</key>
-	<string>9</string>
+	<string>10</string>
 </dict>
 </plist>
diff --git a/Pixiview/Illust/RankingPage.xaml.cs b/Pixiview/Illust/RankingPage.xaml.cs
index 31a6736..4f6905a 100644
--- a/Pixiview/Illust/RankingPage.xaml.cs
+++ b/Pixiview/Illust/RankingPage.xaml.cs
@@ -132,6 +132,12 @@ namespace Pixiview.Illust
             }
             SegmentTypeVisible = r18;
 
+#if __ANDROID__
+            if (currentPage != 1 && Illusts == null)
+            {
+                currentPage = 1;
+            }
+#endif
             base.OnAppearing();
         }
 
diff --git a/Pixiview/Illust/RelatedIllustsPage.xaml.cs b/Pixiview/Illust/RelatedIllustsPage.xaml.cs
index c9e4c8a..209dd2e 100644
--- a/Pixiview/Illust/RelatedIllustsPage.xaml.cs
+++ b/Pixiview/Illust/RelatedIllustsPage.xaml.cs
@@ -27,6 +27,17 @@ namespace Pixiview.Illust
             nextIndex = 0;
         }
 
+        protected override void OnAppearing()
+        {
+#if __ANDROID__
+            if (startIndex != -1 && Illusts == null)
+            {
+                startIndex = -1;
+            }
+#endif
+            base.OnAppearing();
+        }
+
         protected override bool IsAutoReload => false;
         protected override ActivityIndicator LoadingIndicator => activityLoading;
 
diff --git a/Pixiview/Illust/UserIllustPage.xaml.cs b/Pixiview/Illust/UserIllustPage.xaml.cs
index 5f80b9e..4ba38a2 100644
--- a/Pixiview/Illust/UserIllustPage.xaml.cs
+++ b/Pixiview/Illust/UserIllustPage.xaml.cs
@@ -38,6 +38,17 @@ namespace Pixiview.Illust
             nextIndex = 0;
         }
 
+        protected override void OnAppearing()
+        {
+#if __ANDROID__
+            if (startIndex != -1 && Illusts == null)
+            {
+                startIndex = -1;
+            }
+#endif
+            base.OnAppearing();
+        }
+
         protected override bool IsAutoReload => false;
         protected override ActivityIndicator LoadingIndicator => activityLoading;