diff --git a/src/components/ArticleWrapper.vue b/src/components/ArticleWrapper.vue
index 500ac796..2f542901 100644
--- a/src/components/ArticleWrapper.vue
+++ b/src/components/ArticleWrapper.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import dayjs from 'dayjs'
 import Giscus from '@giscus/vue';
+import { useMyDark } from '~/composables/dark';
 
 const { frontmatter } = defineProps<{
     frontmatter: {
@@ -21,9 +22,17 @@ useHead({
     ]
 })
 
-const isDark = useDark()
+const [isDark, _] = useMyDark();
+const discusTheme = computed(() => isDark.value ? 'dark' : 'light');
+
+const showGiscus = ref(true);
+watch(isDark, () => {
+    showGiscus.value = false;
+    nextTick(() => {
+        showGiscus.value = true;
+    })
+});
 
-const discusTheme = isDark.value ? 'dark' : 'light';
 
 </script>
 
@@ -34,9 +43,10 @@ const discusTheme = isDark.value ? 'dark' : 'light';
         <div class="mt-2 italic">{{ (frontmatter.tags || []).map(x => `#${x}`).join(' ') }}</div>
     </div>
     <slot></slot>
-    <Giscus id="comments" repo="ChenKS12138/ChenKS12138.github.io" repoId="MDEwOlJlcG9zaXRvcnkyNzA4Njc3ODM="
-        category="Announcements" categoryId="DIC_kwDOECUdR84Cd10_" mapping="og:title" reactionsEnabled="1" emitMetadata="0"
-        inputPosition="bottom" :theme="discusTheme" lang="zh-CN" loading="lazy" />
+    <Giscus v-if="showGiscus" ref="giscusRef" id="comments" repo="ChenKS12138/ChenKS12138.github.io"
+        repoId="MDEwOlJlcG9zaXRvcnkyNzA4Njc3ODM=" category="Announcements" categoryId="DIC_kwDOECUdR84Cd10_"
+        mapping="og:title" reactionsEnabled="1" emitMetadata="0" inputPosition="bottom" :theme="discusTheme" lang="zh-CN"
+        loading="lazy" />
     <!-- <div class="rounded bg-gray mt-10 p-1 text-white italic indent-md text-lg">
         CC BY-SA 3.0协议 。转载请注明出处!
     </div> -->
diff --git a/src/components/DarkMode.vue b/src/components/DarkMode.vue
index ee02dee1..dec93d27 100644
--- a/src/components/DarkMode.vue
+++ b/src/components/DarkMode.vue
@@ -1,11 +1,10 @@
 <script setup lang="ts">
-const isDark = useDark()
-const toggleDark = useToggle(isDark)
+import { useMyDark } from '~/composables/dark';
+const [_, toggleDark] = useMyDark();
 </script>
 
 <template>
   <button class="cursor-pointer text-white bg-transparent py-0.75 px-2.5 text-sm" @click="toggleDark()">
     <span class="inline-block align-middle dark:i-carbon-moon i-carbon-sun" />
-    <!-- <span class="pl-2">{{ isDark ? 'Dark' : 'Light' }}</span> -->
   </button>
 </template>
diff --git a/src/composables/dark.ts b/src/composables/dark.ts
new file mode 100644
index 00000000..d4b4065d
--- /dev/null
+++ b/src/composables/dark.ts
@@ -0,0 +1,14 @@
+const isDarkRef = ref(false);
+
+const isDark = useDark()
+const toggleDark = useToggle(isDark)
+isDarkRef.value = isDark.value;
+
+export function useMyDark() {
+  const toggleDarkWrapped = () => {
+    toggleDark();
+    isDarkRef.value = isDark.value;
+  }
+
+  return [isDarkRef, toggleDarkWrapped] as const;
+}
\ No newline at end of file