diff --git a/src/component/comments/src/gitment.js b/src/component/comments/src/gitment.js
index 6bce9f1..b5ae972 100644
--- a/src/component/comments/src/gitment.js
+++ b/src/component/comments/src/gitment.js
@@ -181,9 +181,9 @@ export default class Gitment {
 
   loadMeta() {
     const { id, owner, repo, gistId, type = 'issues' } = this
-    if (type === 'gist') {
+    if (type === 'gists') {
       return http
-        .get(`/repos/${owner}/${repo}/${type}/${gistId}`, {
+        .get(`/${type}/${gistId}`, {
           creator: owner,
         })
         .then(issue => {
diff --git a/src/component/comments/src/theme/default.js b/src/component/comments/src/theme/default.js
index c8c3d27..fefed59 100644
--- a/src/component/comments/src/theme/default.js
+++ b/src/component/comments/src/theme/default.js
@@ -5,7 +5,7 @@ import {
 } from '../icons'
 import { NOT_INITIALIZED_ERROR } from '../constants'
 
-function renderHeader({ meta, user, reactions }, instance) {
+function renderHeader({ meta, user, reactions = {} }, instance) {
   const container = document.createElement('div')
   container.lang = 'en-US'
   container.className = 'gitment-container gitment-header-container'
@@ -52,7 +52,7 @@ function renderHeader({ meta, user, reactions }, instance) {
 }
 
 function renderComments(
-  { meta, comments, commentReactions, currentPage, user, error },
+  { meta, comments, commentReactions = {}, currentPage, user, error },
   instance
 ) {
   const container = document.createElement('div')
@@ -110,8 +110,9 @@ function renderComments(
               ? ` • <span title="comment was edited at ${updateDate}">edited</span>`
               : ''
           }
-          <div class="gitment-comment-like-btn">${heartIcon} ${comment.reactions
-      .heart || ''}</div>
+          <div class="gitment-comment-like-btn">${heartIcon} ${(comment.reactions &&
+      comment.reactions.heart) ||
+      ''}</div>
         </div>
         <div class="gitment-comment-body gitment-markdown">${
           comment.body_html
diff --git a/src/pages/gist/index.js b/src/pages/gist/index.js
index 72029db..4ec127d 100644
--- a/src/pages/gist/index.js
+++ b/src/pages/gist/index.js
@@ -146,7 +146,7 @@ class Gist extends Component {
 
             <hr className="hr" />
 
-            <Comments type="gist" gistId={this.props.match.params.id} />
+            <Comments type="gists" gistId={this.props.match.params.id} />
           </div>
         </Spin>
       </DocumentTitle>