diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 481ca262..f013f62d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
        >
         <activity
             android:name=".activities.MainActivity"
-            android:configChanges="orientation|screenSize"
+            android:configChanges="orientation|screenSize|keyboardHidden|screenLayout|smallestScreenSize"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java b/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
index d0b4cd04..22d4776f 100644
--- a/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
+++ b/app/src/main/java/app/fedilab/android/helper/PinnedTimelineHelper.java
@@ -577,7 +577,7 @@ public class PinnedTimelineHelper {
             }
             fragTransaction1.detach(fragmentMastodonTimeline).commit();
             Bundle bundle = new Bundle();
-            bundle.putString(Helper.ARG_REMOTE_INSTANCE, remoteInstance.host != null ? remoteInstance.host : "");
+            bundle.putSerializable(Helper.ARG_REMOTE_INSTANCE, pinned);
             bundle.putString("instanceType", remoteInstance.type.getValue());
             bundle.putString("timelineId", remoteInstance.id);
             bundle.putSerializable(Helper.ARG_TIMELINE_TYPE, Timeline.TimeLineEnum.REMOTE);
@@ -623,7 +623,7 @@ public class PinnedTimelineHelper {
                     currentFilter[0] = remoteInstance.filteredWith;
                     fragTransaction1.detach(fragmentMastodonTimeline).commit();
                     Bundle bundle = new Bundle();
-                    bundle.putString(Helper.ARG_REMOTE_INSTANCE, remoteInstance.host != null ? remoteInstance.host : "");
+                    bundle.putSerializable(Helper.ARG_REMOTE_INSTANCE, pinned);
                     bundle.putString("instanceType", remoteInstance.type.getValue());
                     bundle.putString("timelineId", remoteInstance.id);
                     bundle.putString("currentfilter", remoteInstance.filteredWith);
@@ -698,7 +698,7 @@ public class PinnedTimelineHelper {
                     return;
                 fragTransaction1.detach(fragmentMastodonTimeline).commit();
                 Bundle bundle = new Bundle();
-                bundle.putString(Helper.ARG_REMOTE_INSTANCE, remoteInstance.host != null ? remoteInstance.host : "");
+                bundle.putSerializable(Helper.ARG_REMOTE_INSTANCE, pinned);
                 bundle.putString("instanceType", remoteInstance.type.getValue());
                 bundle.putString("timelineId", remoteInstance.id);
                 if (currentFilter[0] != null) {