diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 6a0dd3dd8..ffe1f1a33 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -1,4 +1,5 @@
 7.3.16
+ - fix: Thread template: next.url and previous.url tmpl_vars are always defined (Yung Han Khoe, United Knowledge)
  - fix: The POD of Form::Image is faulty (perlDreamer Consulting, LLC)
  - fix: Method name clash between WebGUI::Asset::Post::Thread and WebGUI::AssetVersioning (perlDreamer Consulting, LLC)
  - fix: Images in various places were broken in 7.3.15
diff --git a/lib/WebGUI/Asset/Post/Thread.pm b/lib/WebGUI/Asset/Post/Thread.pm
index e52e9a02f..bd7e8d448 100644
--- a/lib/WebGUI/Asset/Post/Thread.pm
+++ b/lib/WebGUI/Asset/Post/Thread.pm
@@ -900,8 +900,10 @@ sub view {
 	$p->appendTemplateVars($var);
         $var->{'add.url'} = $self->getParent->getNewThreadUrl;
  
-	$var->{"previous.url"} = $self->getUrl("func=previousThread");
-	$var->{"next.url"} = $self->getUrl("func=nextThread");
+	my $next = $self->getNextThread;
+        $var->{"previous.url"} = $self->getUrl("func=previousThread") if (defined $next);
+        my $previous = $self->getPreviousThread;
+        $var->{"next.url"} = $self->getUrl("func=nextThread") if (defined $previous);
 
 	$var->{"search.url"} = $self->getParent->getSearchUrl;
         $var->{"collaboration.url"} = $self->getThread->getParent->getUrl;