diff --git a/app/assets/javascripts/discourse/lib/url.js.es6 b/app/assets/javascripts/discourse/lib/url.js.es6
index 3c76d4f51..b5572ef0a 100644
--- a/app/assets/javascripts/discourse/lib/url.js.es6
+++ b/app/assets/javascripts/discourse/lib/url.js.es6
@@ -76,7 +76,7 @@ const DiscourseURL = Ember.Object.createWithMixins({
   },
 
   // Scroll to the same page, different anchor
-  scrollToId: function(id) {
+  scrollToId(id) {
     if (Em.isEmpty(id)) { return; }
 
     _jumpScheduled = true;
diff --git a/app/assets/javascripts/discourse/widgets/post.js.es6 b/app/assets/javascripts/discourse/widgets/post.js.es6
index bc0510ea9..be6ed28ad 100644
--- a/app/assets/javascripts/discourse/widgets/post.js.es6
+++ b/app/assets/javascripts/discourse/widgets/post.js.es6
@@ -379,9 +379,11 @@ export default createWidget('post', {
   shadowTree: true,
 
   buildAttributes(attrs) {
-    if (attrs.cloaked) {
-      return { style: `height: ${attrs.height}px` };
-    }
+    return attrs.cloaked ? { style: `height: ${attrs.height}px` } : undefined;
+  },
+
+  buildId(attrs) {
+    return attrs.cloaked ? `post_${attrs.post_number}` : undefined;
   },
 
   buildClasses(attrs) {