diff --git a/client/coral-embed-stream/src/Comment.js b/client/coral-embed-stream/src/Comment.js
index 83a950a9f..8563fe5e5 100644
--- a/client/coral-embed-stream/src/Comment.js
+++ b/client/coral-embed-stream/src/Comment.js
@@ -60,13 +60,6 @@ class Comment extends React.Component {
           body: PropTypes.string.isRequired,
           id: PropTypes.string.isRequired
         })),
-      tags: PropTypes.arrayOf(
-        PropTypes.shape({
-          name: PropTypes.string,
-          assigned_by: PropTypes.string,
-          created_at: PropTypes.string
-        })
-      ),
       user: PropTypes.shape({
         id: PropTypes.string.isRequired,
         name: PropTypes.string.isRequired
diff --git a/client/coral-framework/graphql/fragments/commentView.graphql b/client/coral-framework/graphql/fragments/commentView.graphql
index 29f9b3bfe..352c65571 100644
--- a/client/coral-framework/graphql/fragments/commentView.graphql
+++ b/client/coral-framework/graphql/fragments/commentView.graphql
@@ -3,6 +3,9 @@ fragment commentView on Comment {
     body
     created_at
     status
+    tags {
+      name
+    }
     user {
         id
         name: displayName
diff --git a/client/coral-plugin-tag-label/TagLabel.js b/client/coral-plugin-tag-label/TagLabel.js
index 103982138..ee5b22f23 100644
--- a/client/coral-plugin-tag-label/TagLabel.js
+++ b/client/coral-plugin-tag-label/TagLabel.js
@@ -11,7 +11,7 @@ export default class TagLabel extends Component {
       <div
         className={`${packagename}-text`}
         className={`${styles.tagLabel}`}>
-        {tags && tags}
+        {tags}
       </div>
     );
   }
diff --git a/graph/typeDefs.graphql b/graph/typeDefs.graphql
index b1f9b82f7..d5dc727eb 100644
--- a/graph/typeDefs.graphql
+++ b/graph/typeDefs.graphql
@@ -63,12 +63,26 @@ type User {
   comments(query: CommentsQuery): [Comment]
 }
 
+type Tag {
+  # the actual tag for the comment.
+  name: COMMENT_TAG
+
+  # the user that assigned the tag. If NULL then the system automatically tagged it.
+  assigned_by: User
+
+  # the time when the tag was assigned.
+  created_at: Date!
+}
+
 type Comment {
   id: ID!
 
   # the actual comment data.
   body: String!
 
+  # the tags on the comment
+  tags: [Tag]
+
   # the user who authored the comment.
   user: User
 
@@ -165,6 +179,11 @@ type Asset {
   created_at: Date
 }
 
+enum COMMENT_TAG {
+  # For the comments submitted by staff members (ADMIN or MODERATOR users).
+  STAFF
+}
+
 enum COMMENT_STATUS {
   ACCEPTED
   REJECTED