diff --git a/src/components/post-desktop/post-desktop.tsx b/src/components/post-desktop/post-desktop.tsx
index d0036654..7c4dbcdb 100644
--- a/src/components/post-desktop/post-desktop.tsx
+++ b/src/components/post-desktop/post-desktop.tsx
@@ -52,7 +52,7 @@ const useShowOmittedReplies = create<ShowOmittedRepliesState>((set) => ({
 
 const PostInfo = ({ post, postReplyCount = 0, roles, isHidden }: PostProps) => {
   const { t } = useTranslation();
-  const { author, cid, deleted, locked, pinned, parentCid, postCid, reason, removed, shortCid, state, subplebbitAddress, timestamp } = post || {};
+  const { author, cid, deleted, locked, pinned, parentCid, postCid, reason, removed, state, subplebbitAddress, timestamp } = post || {};
   const title = post?.title?.trim();
   const replies = useReplies(post);
   const { address, shortAddress } = author || {};
@@ -176,10 +176,10 @@ const PostInfo = ({ post, postReplyCount = 0, roles, isHidden }: PostProps) => {
                 title={t('link_to_post')}
                 onClick={(e) => !cid && e.preventDefault()}
               >
-                CID:
+                No.
               </Link>
               <span className={styles.replyToPost} title={t('reply_to_post')} onMouseDown={onReplyModalClick}>
-                {shortCid}
+                {post?.number || '?'}
               </span>
             </span>
           ) : (
diff --git a/src/components/post-mobile/post-mobile.tsx b/src/components/post-mobile/post-mobile.tsx
index 335ebd8f..04e7896f 100644
--- a/src/components/post-mobile/post-mobile.tsx
+++ b/src/components/post-mobile/post-mobile.tsx
@@ -32,25 +32,8 @@ import { selectPostMenuProps } from '../../lib/utils/post-menu-props';
 const PostInfoAndMedia = ({ post, postReplyCount = 0, roles }: PostProps) => {
   const { t } = useTranslation();
   const defaultSubplebbits = useDefaultSubplebbits();
-  const {
-    author,
-    cid,
-    deleted,
-    link,
-    linkHeight,
-    linkWidth,
-    locked,
-    parentCid,
-    pinned,
-    postCid,
-    reason,
-    removed,
-    shortCid,
-    state,
-    subplebbitAddress,
-    timestamp,
-    thumbnailUrl,
-  } = post || {};
+  const { author, cid, deleted, link, linkHeight, linkWidth, locked, parentCid, pinned, postCid, reason, removed, state, subplebbitAddress, timestamp, thumbnailUrl } =
+    post || {};
   const boardPath = subplebbitAddress ? getBoardPath(subplebbitAddress, defaultSubplebbits) : undefined;
   const isReply = parentCid;
   const title = post?.title?.trim();
@@ -117,7 +100,7 @@ const PostInfoAndMedia = ({ post, postReplyCount = 0, roles }: PostProps) => {
                 )
               ) : (
                 _.capitalize(t('anonymous'))
-              )}
+              )}{' '}
               {!(deleted || removed) && authorRole && (
                 <span className='capitalize'>
                   {' '}
@@ -198,10 +181,10 @@ const PostInfoAndMedia = ({ post, postReplyCount = 0, roles }: PostProps) => {
                   title={t('link_to_post')}
                   onClick={(e) => !cid && e.preventDefault()}
                 >
-                  CID:
+                  No.
                 </Link>
                 <span className={styles.replyToPost} title={t('reply_to_post')} onMouseDown={onReplyModalClick}>
-                  {shortCid.slice(0, -4)}
+                  {post?.number || '?'}
                 </span>
               </span>
             ) : (