diff --git a/pages/category/[category].js b/pages/category/[category].js
index eec3196a..ab07f1f5 100644
--- a/pages/category/[category].js
+++ b/pages/category/[category].js
@@ -7,18 +7,18 @@ import React from 'react'
 import CategoryList from '@/components/CategoryList'
 import { getNotionPageData } from '@/lib/notion/getNotionData'
 
-export default function Category ({ tags, posts, category, categories }) {
+export default function Category ({ tags, allPosts, filteredPosts, category, categories }) {
   const meta = {
     title: `${BLOG.title} | ${category}`,
     description: BLOG.description,
     type: 'website'
   }
-  return <BaseLayout meta={meta} tags={tags} currentCategory={category} totalPosts={posts} categories={categories}>
+  return <BaseLayout meta={meta} tags={tags} currentCategory={category} totalPosts={allPosts} categories={categories}>
     <div className='flex-grow bg-gray-200 dark:bg-black shadow-inner'>
       <StickyBar >
         <CategoryList currentCategory={category} categories={categories} />
       </StickyBar>
-      <BlogPostListScroll posts={posts} tags={tags} currentCategory={category}/>
+      <BlogPostListScroll posts={filteredPosts} tags={tags} currentCategory={category}/>
     </div>
   </BaseLayout>
 }
@@ -37,7 +37,8 @@ export async function getStaticProps ({ params }) {
   return {
     props: {
       tags,
-      posts: filteredPosts,
+      allPosts,
+      filteredPosts,
       category,
       categories
     },
diff --git a/pages/tag/[tag].js b/pages/tag/[tag].js
index 603891a6..0d7048da 100644
--- a/pages/tag/[tag].js
+++ b/pages/tag/[tag].js
@@ -6,18 +6,18 @@ import BlogPostListScroll from '@/components/BlogPostListScroll'
 import TagList from '@/components/TagList'
 import { getNotionPageData } from '@/lib/notion/getNotionData'
 
-export default function Tag ({ tags, posts, currentTag, categories }) {
+export default function Tag ({ tags, allPosts, filteredPosts, currentTag, categories }) {
   const meta = {
     title: `${BLOG.title} | #${currentTag}`,
     description: BLOG.description,
     type: 'website'
   }
-  return <BaseLayout meta={meta} tags={tags} currentTag={currentTag} categories={categories} totalPosts={posts}>
+  return <BaseLayout meta={meta} tags={tags} currentTag={currentTag} categories={categories} totalPosts={allPosts}>
     <div className='flex-grow bg-gray-200 dark:bg-black shadow-inner'>
       <StickyBar>
         <TagList tags={tags} currentTag={currentTag}/>
       </StickyBar>
-      <BlogPostListScroll posts={posts} tags={tags} currentTag={currentTag}/>
+      <BlogPostListScroll posts={filteredPosts} tags={tags} currentTag={currentTag}/>
     </div>
   </BaseLayout>
 }
@@ -36,7 +36,8 @@ export async function getStaticProps ({ params }) {
   return {
     props: {
       tags,
-      posts: filteredPosts,
+      allPosts,
+      filteredPosts,
       currentTag,
       categories
     },