diff --git a/routes/topic_list.go b/routes/topic_list.go
index 3b879d2a..ee58f650 100644
--- a/routes/topic_list.go
+++ b/routes/topic_list.go
@@ -179,10 +179,6 @@ func TopicListCommon(w http.ResponseWriter, r *http.Request, user c.User, header
 	if err != nil {
 		return c.InternalError(err, w, r)
 	}
-	// ! Need an inline error not a page level error
-	if len(topicList) == 0 {
-		return c.NotFound(w, r, header)
-	}
 
 	// TODO: Reduce the amount of boilerplate here
 	if r.FormValue("js") == "1" {
diff --git a/templates/topics.html b/templates/topics.html
index 11e6a348..81ec81f3 100644
--- a/templates/topics.html
+++ b/templates/topics.html
@@ -78,9 +78,9 @@
 	<div class="rowitem rowmsg"><a href="" class="more_topics"></a></div>
 </div>
 <div id="topic_list" class="rowblock topic_list topic_list_{{.Sort.SortBy}}" aria-label="{{lang "topics_list_aria"}}">
-	{{range .TopicList}}{{template "topics_topic.html" . }}{{else}}<div class="rowitem passive rowmsg">{{lang "topics_no_topics"}}{{if .CurrentUser.Loggedin}}{{if .CurrentUser.Perms.CreateTopic}} <a href="/topics/create/">{{lang "topics_start_one"}}</a>{{end}}{{end}}</div>{{end}}
+	{{range .TopicList}}{{template "topics_topic.html" . }}{{else}}<div class="rowitem passive rowmsg">{{lang "topics_no_topics"}}{{if .CurrentUser.Loggedin}}{{if .CurrentUser.Perms.CreateTopic}}&nbsp;<a href="/topics/create/">{{lang "topics_start_one"}}</a>{{end}}{{end}}</div>{{end}}
 </div>
 
 {{template "paginator.html" . }}
 </main>
-{{template "footer.html" . }}
+{{template "footer.html" . }}
\ No newline at end of file