diff --git a/inc/functions.php b/inc/functions.php
index 6c0c6033..c9f6657e 100644
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -2277,31 +2277,22 @@ function markup(&$body, $track_cites = false) {
 			if ($cite) {
 				if (isset($cited_posts[$_board][$cite])) {
 					$link = $cited_posts[$_board][$cite];
-				        if (isset($original_board)){
-						$replacement = '<a ' .
+					$replacement_board = $original_board ?? $_board;
+
+					$replacement = '<a ' .
 						($_board == $board['uri'] ?
 							'onclick="highlightReply(\''.$cite.'\', event);" '
 						: '') . 'href="' . $link . '">' .
-						'&gt;&gt;&gt;/' . $original_board . '/' . $cite .
+						'&gt;&gt;&gt;/' . $replacement_board . '/' . $cite .
 						'</a>';
 
+					if ($track_cites && $config['track_cites']) {
+						$tracked_cites[] = [ $_board, $cite ];
 					}
-					else {
-						$replacement = '<a ' .
-						($_board == $board['uri'] ?
-							'onclick="highlightReply(\''.$cite.'\', event);" '
-						: '') . 'href="' . $link . '">' .
-						'&gt;&gt;&gt;/' . $_board . '/' . $cite .
-						'</a>';
-
-					}
-
-					if ($track_cites && $config['track_cites'])
-						$tracked_cites[] = array($_board, $cite);
 				} else {
 					$replacement = "<s>&gt;&gt;&gt;/$_board/$cite</s>";
 				}
-			} elseif(isset($crossboard_indexes[$_board])) {
+			} elseif (isset($crossboard_indexes[$_board])) {
 				$replacement = '<a href="' . $crossboard_indexes[$_board] . '">' .
 						'&gt;&gt;&gt;/' . $_board . '/' .
 						'</a>';