diff --git a/client/helpers/router.js b/client/helpers/router.js
index 59001bd3e..820d0c557 100644
--- a/client/helpers/router.js
+++ b/client/helpers/router.js
@@ -298,7 +298,8 @@ CommentPageController = RouteController.extend({
   waitOn: function() {
     return [
       Meteor.subscribe('singleComment', this.params._id),
-      Meteor.subscribe('commentUser', this.params._id)
+      Meteor.subscribe('commentUser', this.params._id),
+      Meteor.subscribe('commentPost', this.params._id)
     ]
   },
   data: function() {
diff --git a/client/views/comments/comment_page.html b/client/views/comments/comment_page.html
index 3fdd25ea4..ca8986533 100644
--- a/client/views/comments/comment_page.html
+++ b/client/views/comments/comment_page.html
@@ -1,14 +1,16 @@
 <template name="comment_page">
   {{#if canView}}
   <div class="post grid comment-page">
+    
+    {{#with post}}
+      {{>post_item}}
+    {{/with}}
 
-    {{#if comment}}
     {{#with comment}}
       <ul class="selected-comment">
        {{> comment_item}}
       </ul>
     {{/with}}
-    {{/if}}
 
   </div>
   {{/if}}
diff --git a/client/views/comments/comment_page.js b/client/views/comments/comment_page.js
index d9b8de153..2f4a2699e 100644
--- a/client/views/comments/comment_page.js
+++ b/client/views/comments/comment_page.js
@@ -1,4 +1,5 @@
-Template.comment_page.post = function(){
-  var selectedComment = Comments.findOne(Session.get('selectedCommentId'));
-  return selectedComment && Posts.findOne(selectedComment.post);
-};
\ No newline at end of file
+Template.comment_page.helpers({
+  post: function () {
+    return Posts.findOne(this.comment.post);
+  }
+});
\ No newline at end of file
diff --git a/client/views/comments/comment_reply.html b/client/views/comments/comment_reply.html
index e84378188..f1d1a82a4 100644
--- a/client/views/comments/comment_reply.html
+++ b/client/views/comments/comment_reply.html
@@ -1,21 +1,19 @@
 <template name="comment_reply">
   {{#if canComment "replace"}}
   <div class="post grid comment-page">
-    {{#if post}}
+    
     {{#with post}}
       {{> post_item}}
     {{/with}}
-    {{/if}}
 
-    {{#if comment}}
     {{#with comment}}
       <ul class="selected-comment">
        {{> comment_item}}
       </ul>
     {{/with}}
-    {{/if}}
 
     {{> comment_form}}
+    
   </div>
   {{/if}}
 </template>
diff --git a/client/views/comments/comment_reply.js b/client/views/comments/comment_reply.js
index 74432aba4..187baf0a5 100644
--- a/client/views/comments/comment_reply.js
+++ b/client/views/comments/comment_reply.js
@@ -1,4 +1,5 @@
-Template.comment_reply.post = function(){
-  var comment = this;
-  return comment && Posts.findOne(comment.post);
-};
\ No newline at end of file
+Template.comment_reply.helpers({
+  post: function () {
+    return Posts.findOne(this.comment.post);
+  }
+});
\ No newline at end of file
diff --git a/server/publications.js b/server/publications.js
index 6fb32853d..0194dfddd 100644
--- a/server/publications.js
+++ b/server/publications.js
@@ -83,6 +83,15 @@ Meteor.publish('singlePost', function(id) {
   }
 });
 
+// The post related to the current comment
+
+Meteor.publish('commentPost', function(commentId) {
+  if(canViewById(this.userId)){
+    var comment = Comments.findOne(commentId);
+    return Posts.find(comment.post);
+  }
+});
+
 Meteor.publish('postsList', function(find, options) {
   if(canViewById(this.userId)){
     options = options || {};