diff --git a/4chan_x.user.js b/4chan_x.user.js
index 8add77b3c..e13553e39 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -3320,13 +3320,13 @@
       _ref = $$('.quotelink', root);
       for (_i = 0, _len = _ref.length; _i < _len; _i++) {
         quote = _ref[_i];
-        hash = quote.hash.slice(1);
+        if (!(hash = quote.hash.slice(1))) continue;
         if (conf['Indicate OP quote'] && hash === tid) {
           $.add(quote, $.tn('\u00A0(OP)'));
-          return;
+          continue;
         }
         path = quote.pathname;
-        if (conf['Indicate Cross-thread Quotes'] && hash && path.lastIndexOf("/" + tid) === -1 && path.indexOf("/" + g.BOARD + "/") === 0) {
+        if (conf['Indicate Cross-thread Quotes'] && path.lastIndexOf("/" + tid) === -1 && path.indexOf("/" + g.BOARD + "/") === 0) {
           $.add(quote, $.tn('\u00A0(Cross-thread)'));
         }
       }
diff --git a/script.coffee b/script.coffee
index 154e05661..6c258a4f1 100644
--- a/script.coffee
+++ b/script.coffee
@@ -2674,14 +2674,15 @@ quoteIndicators =
     # We use contains() so that it works with hidden threads
     tid = g.THREAD_ID or $.x('ancestor::div[contains(@class,"thread")]', root).firstChild.id
     for quote in $$ '.quotelink', root
-      hash = quote.hash[1..]
+      unless hash = quote.hash[1..]
+        continue
       if conf['Indicate OP quote'] and hash is tid
         # \u00A0 is nbsp
         $.add quote, $.tn '\u00A0(OP)'
-        return
+        continue
       path = quote.pathname
       #if quote leads to a different thread id and is located on the same board (index 0)
-      if conf['Indicate Cross-thread Quotes'] and hash and path.lastIndexOf("/#{tid}") is -1 and path.indexOf("/#{g.BOARD}/") is 0
+      if conf['Indicate Cross-thread Quotes'] and path.lastIndexOf("/#{tid}") is -1 and path.indexOf("/#{g.BOARD}/") is 0
         # \u00A0 is nbsp
         $.add quote, $.tn '\u00A0(Cross-thread)'
     return