diff --git a/test/api/v2/groups/chat/POST-groups_id_chat_id_clearflags.test.js b/test/api/v2/groups/chat/POST-groups_id_chat_id_clearflags.test.js
new file mode 100644
index 0000000000..e6873c96b1
--- /dev/null
+++ b/test/api/v2/groups/chat/POST-groups_id_chat_id_clearflags.test.js
@@ -0,0 +1,140 @@
+import {
+  createAndPopulateGroup,
+  generateUser,
+  requester,
+  translate as t,
+} from '../../../../helpers/api-integration.helper';
+
+describe('POST /groups/:id/chat/:id/clearflags', () => {
+  let group;
+
+  beforeEach(() => {
+    return createAndPopulateGroup({
+      groupDetails: {
+        type: 'guild',
+        privacy: 'public',
+        members: 1,
+        flagCount: 1,
+        chat: [{
+          id: 'message-to-clear',
+          flagCount: 1,
+          flags: { 'some-id': true },
+        }],
+      },
+    }).then((res) => {
+      group = res.group;
+    });
+  });
+
+  context('non admin', () => {
+    let api;
+
+    beforeEach(() => {
+      return generateUser().then((user) => {
+        api = requester(user);
+      });
+    });
+
+    it('cannot clear flags', () => {
+      return expect(api.post(`/groups/${group._id}/chat/message-to-clear/clearflags`))
+        .to.eventually.be.rejected.and.eql({
+          code: 401,
+          text: t('messageGroupChatAdminClearFlagCount'),
+        });
+    });
+  });
+
+  context('admin', () => {
+    let api;
+
+    beforeEach(() => {
+      return generateUser({
+        'contributor.admin': true,
+      }).then((user) => {
+        api = requester(user);
+      });
+    });
+
+    it('clears flags', () => {
+      return api.post(`/groups/${group._id}/chat/message-to-clear/clearflags`).then((res) => {
+        return api.get(`/groups/${group._id}/chat`);
+      }).then((messages) => {
+        expect(messages[0].flagCount).to.eql(0);
+      });
+    });
+
+    it('leaves old flags on the flag object', () => {
+      return api.post(`/groups/${group._id}/chat/message-to-clear/clearflags`).then((res) => {
+        return api.get(`/groups/${group._id}/chat`);
+      }).then((messages) => {
+        expect(messages[0].flags).to.have.property('some-id', true);
+      });
+    });
+
+    it('returns error if message does not exist', () => {
+      return expect(api.post(`/groups/${group._id}/chat/non-existant-message/clearflags`))
+        .to.eventually.be.rejected.and.eql({
+          code: 404,
+          text: t('messageGroupChatNotFound'),
+        });
+    });
+  });
+
+  context('admin user, group with multiple messages', () => {
+    let admin, author, group, member;
+
+    beforeEach(() => {
+      return generateUser().then((user) => {
+        author = user;
+
+        return createAndPopulateGroup({
+          groupDetails: {
+            type: 'guild',
+            privacy: 'public',
+            chat: [
+              { id: 'message-to-unflag', uuid: author._id, flagCount: 1, flags: {'some-user': true} },
+              { id: '1-flag-message', uuid: author._id, flagCount: 1, flags: { 'id1': true } },
+              { id: '2-flag-message', uuid: author._id, flagCount: 2, flags: { 'id1': true, 'id2': true } },
+              { id: 'no-flags', uuid: author._id, flagCount: 0, flags: {} },
+            ],
+          },
+          members: 1,
+        });
+      }).then((res) => {
+        group = res.group;
+        return generateUser({
+          'contributor.admin': true,
+        });
+      }).then((user) => {
+        admin = user;
+      });
+    });
+
+    it('changes only the message that is flagged', () => {
+      let api = requester(admin);
+
+      return api.post(`/groups/${group._id}/chat/message-to-unflag/clearflags`).then((messages) => {
+        return api.get(`/groups/${group._id}/chat`);
+      }).then((messages) => {
+        expect(messages).to.have.lengthOf(4);
+
+        let messageThatWasUnflagged = messages[0];
+        let messageWith1Flag = messages[1];
+        let messageWith2Flag = messages[2];
+        let messageWithoutFlags = messages[3];
+
+        expect(messageThatWasUnflagged.flagCount).to.eql(0);
+        expect(messageThatWasUnflagged.flags).to.have.property('some-user', true);
+
+        expect(messageWith1Flag.flagCount).to.eql(1);
+        expect(messageWith1Flag.flags).to.have.property('id1', true);
+
+        expect(messageWith2Flag.flagCount).to.eql(2);
+        expect(messageWith2Flag.flags).to.have.property('id1', true);
+
+        expect(messageWithoutFlags.flagCount).to.eql(0);
+        expect(messageWithoutFlags.flags).to.eql({});
+      });
+    });
+  });
+});
diff --git a/website/src/controllers/api-v2/groups.js b/website/src/controllers/api-v2/groups.js
index e0267940a1..158685265d 100644
--- a/website/src/controllers/api-v2/groups.js
+++ b/website/src/controllers/api-v2/groups.js
@@ -412,8 +412,9 @@ api.clearFlagCount = function(req, res, next){
   if(user.contributor.admin){
     message.flagCount = 0;
 
-    group.markModified('chat');
-    group.save(function(err,_saved){
+    Group.update({_id: group._id, 'chat.id': message.id}, {'$set': {
+      'chat.$.flagCount': message.flagCount,
+    }}, function(err) {
       if(err) return next(err);
       return res.send(204);
     });