diff --git a/client/coral-framework/utils/index.js b/client/coral-framework/utils/index.js
index 4ec6f8cab..93dcad027 100644
--- a/client/coral-framework/utils/index.js
+++ b/client/coral-framework/utils/index.js
@@ -3,18 +3,16 @@ export const getTotalActionCount = (type, comment) => {
     return 0;
   }
 
-  return comment.action_summaries.reduce((total, summary) => {
-    if (summary.__typename === type) {
+  return comment.action_summaries
+    .filter(s => s.__typename === type)
+    .reduce((total, summary) => {
       return total + summary.count;
-    } else {
-      return total;
-    }
-  }, 0);
+    }, 0);
 };
 
 export const iPerformedThisAction = (type, comment) => {
   if (!comment.action_summaries) {
-    return 0;
+    return false;
   }
 
   // if there is a current_user on any of the ActionSummary(s), the user performed this action
@@ -23,6 +21,16 @@ export const iPerformedThisAction = (type, comment) => {
     .some(a => a.current_user);
 };
 
+export const getMyActionSummary = (type, comment) => {
+  if (!comment.action_summaries) {
+    return null;
+  }
+
+  return comment.action_summaries
+    .filter(a => a.__typename === type)
+    .find(a => a.current_user);
+};
+
  /**
  * getActionSummary
  * retrieves the action summaries based on the type and the comment
diff --git a/plugins/coral-plugin-respect/client/components/RespectButton.js b/plugins/coral-plugin-respect/client/components/RespectButton.js
index 9e851460e..417b978ad 100644
--- a/plugins/coral-plugin-respect/client/components/RespectButton.js
+++ b/plugins/coral-plugin-respect/client/components/RespectButton.js
@@ -5,6 +5,7 @@ import Icon from './Icon';
 import {I18n} from 'coral-framework';
 import cn from 'classnames';
 import translations from '../translations.json';
+import {getMyActionSummary, getTotalActionCount} from 'coral-framework/utils';
 
 const lang = new I18n(translations);
 
@@ -14,8 +15,7 @@ class RespectButton extends Component {
     const {postRespect, showSignInDialog, deleteAction, commentId} = this.props;
     const {me, comment} = this.props.data;
 
-    const respect = comment.action_summaries[0];
-    const respected = (respect && respect.current_user);
+    const myRespectActionSummary = getMyActionSummary('RespectActionSummary', comment);
 
     // If the current user does not exist, trigger sign in dialog.
     if (!me) {
@@ -29,29 +29,33 @@ class RespectButton extends Component {
       return;
     }
 
-    if (!respected) {
+    if (myRespectActionSummary) {
+      deleteAction(myRespectActionSummary.current_user.id);
+    } else {
       postRespect({
         item_id: commentId,
         item_type: 'COMMENTS'
       });
-    } else {
-      deleteAction(respect.current_user.id);
     }
   }
 
   render() {
     const {comment} = this.props.data;
-    const respect = comment && comment.action_summaries && comment.action_summaries[0];
-    const respected = respect && respect.current_user;
-    let count = respect ? respect.count : 0;
+
+    if (!comment) {
+      return null;
+    }
+
+    const myRespect = getMyActionSummary('RespectActionSummary', comment);
+    let count = getTotalActionCount('RespectActionSummary', comment);
 
     return (
       <div className={styles.respect}>
         <button
-          className={cn(styles.button, {[styles.respected]: respected})}
+          className={cn(styles.button, {[styles.respected]: myRespect})}
           onClick={this.handleClick} >
-          <span>{lang.t(respected ? 'respected' : 'respect')}</span>
-          <Icon className={cn(styles.icon, {[styles.respected]: respected})} />
+          <span>{lang.t(myRespect ? 'respected' : 'respect')}</span>
+          <Icon className={cn(styles.icon, {[styles.respected]: myRespect})} />
           {count > 0 && count}
         </button>
       </div>
@@ -64,4 +68,3 @@ RespectButton.propTypes = {
 };
 
 export default RespectButton;
-