diff --git a/Cite.php b/Cite.php
index 756a08bb7..83f060dec 100644
--- a/Cite.php
+++ b/Cite.php
@@ -291,7 +291,7 @@ function wfCite() {
 						);
 				} else {
 					// We've been here before
-					if ( empty($this->mRefs[$key]['text']) and !empty($str)) {
+					if ( $this->mRefs[$key]['text'] === null && $str !== '' ) {
 						// If no text found before, use this text
 						$this->mRefs[$key]['text'] = $str;
 					};
diff --git a/citeParserTests.txt b/citeParserTests.txt
index e966fe385..9bac1ab03 100644
--- a/citeParserTests.txt
+++ b/citeParserTests.txt
@@ -136,3 +136,51 @@ Templating<ref>Text<!--comment--></ref>
 <p>1337
 </p>
 !! end
+
+!! test
+Blank ref followed by ref with content
+!! input
+<ref name="blank"/>
+
+<ref name="blank">content</ref>
+
+<references/>
+!! result
+<p><sup id="_ref-blank_0" class="reference"><a href="#_note-blank" title="">[1]</a></sup>
+</p><p><sup id="_ref-blank_1" class="reference"><a href="#_note-blank" title="">[1]</a></sup>
+</p>
+<ol class="references"><li id="_note-blank">↑ <a href="#_ref-blank_0" title=""><sup>1.0</sup></a> <a href="#_ref-blank_1" title=""><sup>1.1</sup></a> content</li></ol>
+
+!! end
+
+!! test
+Regression: non-blank ref "0" followed by ref with content
+!! input
+<ref name="blank">0</ref>
+
+<ref name="blank">content</ref>
+
+<references/>
+!! result
+<p><sup id="_ref-blank_0" class="reference"><a href="#_note-blank" title="">[1]</a></sup>
+</p><p><sup id="_ref-blank_1" class="reference"><a href="#_note-blank" title="">[1]</a></sup>
+</p>
+<ol class="references"><li id="_note-blank">↑ <a href="#_ref-blank_0" title=""><sup>1.0</sup></a> <a href="#_ref-blank_1" title=""><sup>1.1</sup></a> 0</li></ol>
+
+!! end
+
+!! test
+Regression sanity check: non-blank ref "1" followed by ref with content
+!! input
+<ref name="blank">1</ref>
+
+<ref name="blank">content</ref>
+
+<references/>
+!! result
+<p><sup id="_ref-blank_0" class="reference"><a href="#_note-blank" title="">[1]</a></sup>
+</p><p><sup id="_ref-blank_1" class="reference"><a href="#_note-blank" title="">[1]</a></sup>
+</p>
+<ol class="references"><li id="_note-blank">↑ <a href="#_ref-blank_0" title=""><sup>1.0</sup></a> <a href="#_ref-blank_1" title=""><sup>1.1</sup></a> 1</li></ol>
+
+!! end