diff --git a/packages/frontend/src/components/MkPagination.vue b/packages/frontend/src/components/MkPagination.vue
index 239604b3e3..903e7593a1 100644
--- a/packages/frontend/src/components/MkPagination.vue
+++ b/packages/frontend/src/components/MkPagination.vue
@@ -90,6 +90,9 @@ function concatMapWithArray(map: MisskeyEntityMap, entities: MisskeyEntity[]): M
 </script>
 <script lang="ts" setup>
 import { infoImageUrl } from '@/instance.js';
+import MkButton from '@/components/MkButton.vue';
+import MkLoading from '@/components/global/MkLoading.vue';
+import MkError from '@/components/global/MkError.vue';
 
 const props = withDefaults(defineProps<{
 	pagination: Paging;
diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue
index 60587e67c6..f8bb64f80b 100644
--- a/packages/frontend/src/components/MkTimeline.vue
+++ b/packages/frontend/src/components/MkTimeline.vue
@@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 </template>
 
 <script lang="ts" setup>
-import { computed, onBeforeMount, onUnmounted, onBeforeUpdate, provide } from 'vue';
+import { computed, watch, onUnmounted, provide } from 'vue';
 import { Connection } from 'misskey-js/built/streaming.js';
 import MkNotes from '@/components/MkNotes.vue';
 import MkPullToRefresh from '@/components/MkPullToRefresh.vue';
@@ -234,13 +234,16 @@ function refreshEndpointAndChannel() {
 	updatePaginationQuery();
 }
 
+// IDが切り替わったら切り替え先のTLを表示させたい
+watch(() => [props.list, props.antenna, props.channel, props.role], refreshEndpointAndChannel);
+
+// 初回表示用
+refreshEndpointAndChannel();
+
 onUnmounted(() => {
 	disconnectChannel();
 });
 
-onBeforeMount(refreshEndpointAndChannel);
-onBeforeUpdate(refreshEndpointAndChannel);
-
 function reloadTimeline() {
 	return new Promise<void>((res) => {
 		tlNotesCount = 0;