diff --git a/src/discussions/posts/post/PostFooter.jsx b/src/discussions/posts/post/PostFooter.jsx
index eb83a4a9..45628f47 100644
--- a/src/discussions/posts/post/PostFooter.jsx
+++ b/src/discussions/posts/post/PostFooter.jsx
@@ -66,20 +66,31 @@ function PostFooter({
         <Badge variant="light">{intl.formatMessage(messages.newLabel, { count: post.unreadCommentCount })}</Badge>
       ) : null}
       <div className="d-flex flex-fill justify-content-end align-items-center">
-        {!preview
-          && (
-            <span className="text-gray-500 mr-4 d-flex align-items-center">
-              <Icon
-                src={Person}
-                className="mr-1"
-                style={{
-                  width: '1em',
-                  height: '1em',
-                }}
-              />
-              {post.groupName || intl.formatMessage(messages.visibleToAll)}
-            </span>
-          )}
+        {
+          post.groupId
+            ? (
+              <>
+                <OverlayTrigger
+                  overlay={(
+                    <Tooltip>
+                      {post.groupName || intl.formatMessage(messages.visibleToAll)}
+                    </Tooltip>
+                  )}
+                >
+                  <Icon
+                    data-testid="cohort-icon"
+                    src={Person}
+                    className="text-gray-500"
+                    style={{
+                      width: '1em',
+                      height: '1em',
+                    }}
+                  />
+                </OverlayTrigger>
+                <span className="text-gray-500 mx-1">·</span>
+              </>
+            ) : null
+        }
         <span title={post.createdAt} className="text-gray-500">
           {timeago.format(post.createdAt, intl.locale)}
         </span>
diff --git a/src/discussions/posts/post/PostFooter.test.jsx b/src/discussions/posts/post/PostFooter.test.jsx
index 43129653..7ff4ac8c 100644
--- a/src/discussions/posts/post/PostFooter.test.jsx
+++ b/src/discussions/posts/post/PostFooter.test.jsx
@@ -73,4 +73,12 @@ describe('PostFooter', () => {
     renderComponent({ ...mockPost, unreadCommentCount: 1, commentCount: 1 });
     expect(screen.queryByText('1 new')).toBeFalsy();
   });
+
+  it('has the cohort icon only when group information is present', () => {
+    renderComponent(mockPost);
+    expect(screen.queryByTestId('cohort-icon')).toBeFalsy();
+
+    renderComponent({ ...mockPost, groupId: 5, groupName: 'Test Cohort' });
+    expect(screen.getByTestId('cohort-icon')).toBeTruthy();
+  });
 });