diff --git a/themes/medium/LayoutCategoryIndex.js b/themes/medium/LayoutCategoryIndex.js
index 5d200fe2..c9c79254 100644
--- a/themes/medium/LayoutCategoryIndex.js
+++ b/themes/medium/LayoutCategoryIndex.js
@@ -3,7 +3,7 @@ import Link from 'next/link'
 import LayoutBase from './LayoutBase'
 
 export const LayoutCategoryIndex = (props) => {
-  const { categories } = props
+  const { categoryOptions } = props
   const { locale } = useGlobal()
   return (
     <LayoutBase {...props}>
@@ -12,7 +12,7 @@ export const LayoutCategoryIndex = (props) => {
           <i className='mr-4 fas fa-th' />{locale.COMMON.CATEGORY}:
         </div>
         <div id='category-list' className='duration-200 flex flex-wrap'>
-          {categories && categories.map(category => {
+          {categoryOptions?.map(category => {
             return (
               <Link
                 key={category.name}
diff --git a/themes/medium/LayoutTagIndex.js b/themes/medium/LayoutTagIndex.js
index 1667dc63..b007257a 100644
--- a/themes/medium/LayoutTagIndex.js
+++ b/themes/medium/LayoutTagIndex.js
@@ -3,7 +3,7 @@ import TagItemMini from './components/TagItemMini'
 import LayoutBase from './LayoutBase'
 
 export const LayoutTagIndex = props => {
-  const { tags } = props
+  const { tagOptions } = props
   const { locale } = useGlobal()
   return (
     <LayoutBase {...props}>
@@ -13,7 +13,7 @@ export const LayoutTagIndex = props => {
           {locale.COMMON.TAGS}:
         </div>
         <div id="tags-list" className="duration-200 flex flex-wrap">
-          {tags.map(tag => {
+          {tagOptions.map(tag => {
             return (
               <div key={tag.name} className="p-2">
                 <TagItemMini key={tag.name} tag={tag} />