diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js
index 854e01d58..437da2cd0 100644
--- a/builds/appchan-x.user.js
+++ b/builds/appchan-x.user.js
@@ -3397,13 +3397,6 @@
         this.nodes.date = date;
         this.info.date = new Date(date.dataset.utc * 1000);
       }
-      if (Conf['Quick Reply']) {
-        this.info.yours = QR.db.get({
-          boardID: this.board,
-          threadID: this.thread,
-          postID: this.ID
-        });
-      }
       this.parseComment();
       this.parseQuotes();
       this.parseFile(that);
@@ -7557,7 +7550,11 @@
       if (this.isClone) {
         return;
       }
-      if (this.info.yours) {
+      if (QR.db.get({
+        boardID: this.board.ID,
+        threadID: this.thread.ID,
+        postID: this.ID
+      })) {
         $.addClass(this.nodes.root, 'yourPost');
       }
       if (!this.quotes.length) {
diff --git a/builds/crx/script.js b/builds/crx/script.js
index a97c5a849..d6c141277 100644
--- a/builds/crx/script.js
+++ b/builds/crx/script.js
@@ -3402,13 +3402,6 @@
         this.nodes.date = date;
         this.info.date = new Date(date.dataset.utc * 1000);
       }
-      if (Conf['Quick Reply']) {
-        this.info.yours = QR.db.get({
-          boardID: this.board,
-          threadID: this.thread,
-          postID: this.ID
-        });
-      }
       this.parseComment();
       this.parseQuotes();
       this.parseFile(that);
@@ -7560,7 +7553,11 @@
       if (this.isClone) {
         return;
       }
-      if (this.info.yours) {
+      if (QR.db.get({
+        boardID: this.board.ID,
+        threadID: this.thread.ID,
+        postID: this.ID
+      })) {
         $.addClass(this.nodes.root, 'yourPost');
       }
       if (!this.quotes.length) {
diff --git a/src/General/lib/post.class b/src/General/lib/post.class
index 035857eaf..22c48a213 100755
--- a/src/General/lib/post.class
+++ b/src/General/lib/post.class
@@ -48,11 +48,6 @@ class Post
     if date           = $ '.dateTime',           info
       @nodes.date     = date
       @info.date      = new Date date.dataset.utc * 1000
-    if Conf['Quick Reply']
-      @info.yours     = QR.db.get
-        boardID:  @board
-        threadID: @thread
-        postID:   @ID
 
     @parseComment()
     @parseQuotes()
diff --git a/src/Quotelinks/QuoteYou.coffee b/src/Quotelinks/QuoteYou.coffee
index 52423e364..9ff43378d 100755
--- a/src/Quotelinks/QuoteYou.coffee
+++ b/src/Quotelinks/QuoteYou.coffee
@@ -20,7 +20,7 @@ QuoteYou =
   node: ->
     return if @isClone
 
-    if @info.yours
+    if QR.db.get {boardID: @board.ID, threadID: @thread.ID, postID: @ID}
       $.addClass @nodes.root, 'yourPost'
 
     # Stop there if there's no quotes in that post.