diff --git a/app/presenters/comment_presenter.rb b/app/presenters/comment_presenter.rb
index 46474db79..3aeb67409 100644
--- a/app/presenters/comment_presenter.rb
+++ b/app/presenters/comment_presenter.rb
@@ -14,7 +14,7 @@ class CommentPresenter < ApplicationPresenter
     else
       issue = Issue.where(:id => comment.created_from_issue_id).first
       @referenced_issue = issue.pull_request || issue
-      if issue && Comment.exists?(comment.data[:comment_id])
+      if issue && (comment.data[:comment_id].nil? || Comment.exists?(comment.data[:comment_id]))
         title = if issue == opts[:commentable]
                      "#{issue.serial_id}"
                     elsif issue.project.owner == opts[:commentable].project.owner