diff --git a/client/src/models/Card.js b/client/src/models/Card.js
index 6da30db5..669d6255 100755
--- a/client/src/models/Card.js
+++ b/client/src/models/Card.js
@@ -405,6 +405,25 @@ export default class extends BaseModel {
         });
 
         break;
+      case ActionTypes.COMMENT_CREATE:
+      case ActionTypes.COMMENT_CREATE_HANDLE: {
+        const cardModel = Card.withId(payload.comment.cardId);
+
+        if (cardModel) {
+          cardModel.commentsTotal += 1;
+        }
+
+        break;
+      }
+      case ActionTypes.COMMENT_DELETE_HANDLE: {
+        const cardModel = Card.withId(payload.comment.cardId);
+
+        if (cardModel) {
+          cardModel.commentsTotal -= 1;
+        }
+
+        break;
+      }
       case ActionTypes.ACTIVITIES_IN_CARD_FETCH:
         Card.withId(payload.cardId).update({
           isActivitiesFetching: true,
diff --git a/client/src/models/Comment.js b/client/src/models/Comment.js
index eea83d5c..215ef45c 100755
--- a/client/src/models/Comment.js
+++ b/client/src/models/Comment.js
@@ -42,15 +42,12 @@ export default class extends BaseModel {
 
         break;
       case ActionTypes.COMMENT_CREATE:
-      case ActionTypes.COMMENT_CREATE_HANDLE: {
-        const commentModel = Comment.upsert(payload.comment);
-
-        if (commentModel.card) {
-          commentModel.card.commentsTotal += 1;
-        }
+      case ActionTypes.COMMENT_CREATE_HANDLE:
+      case ActionTypes.COMMENT_UPDATE__SUCCESS:
+      case ActionTypes.COMMENT_UPDATE_HANDLE:
+        Comment.upsert(payload.comment);
 
         break;
-      }
       case ActionTypes.COMMENT_CREATE__SUCCESS:
         Comment.withId(payload.localId).delete();
         Comment.upsert(payload.comment);
@@ -69,11 +66,6 @@ export default class extends BaseModel {
       case ActionTypes.COMMENT_UPDATE:
         Comment.withId(payload.id).update(payload.data);
 
-        break;
-      case ActionTypes.COMMENT_UPDATE__SUCCESS:
-      case ActionTypes.COMMENT_UPDATE_HANDLE:
-        Comment.upsert(payload.comment);
-
         break;
       case ActionTypes.COMMENT_DELETE: {
         const commentModel = Comment.withId(payload.id);
@@ -82,24 +74,12 @@ export default class extends BaseModel {
 
         break;
       }
-      case ActionTypes.COMMENT_DELETE__SUCCESS: {
-        const commentModel = Comment.withId(payload.comment.id);
-
-        if (commentModel) {
-          commentModel.delete();
-        }
-
-        break;
-      }
+      case ActionTypes.COMMENT_DELETE__SUCCESS:
       case ActionTypes.COMMENT_DELETE_HANDLE: {
         const commentModel = Comment.withId(payload.comment.id);
 
         if (commentModel) {
           commentModel.delete();
-
-          if (commentModel.card) {
-            commentModel.card.commentsTotal -= 1;
-          }
         }
 
         break;