diff --git a/routes/topic.go b/routes/topic.go
index 3716737c..f135c439 100644
--- a/routes/topic.go
+++ b/routes/topic.go
@@ -71,9 +71,6 @@ func ViewTopic(w http.ResponseWriter, r *http.Request, user common.User, urlBit
 	}
 	header.Title = topic.Title
 	header.Zone = "view_topic"
-	// TODO: Only include these on pages with polls
-	header.AddSheet("chartist/chartist.min.css")
-	header.AddScript("chartist/chartist.min.js")
 
 	topic.ContentHTML = common.ParseMessage(topic.Content, topic.ParentID, "forums")
 	topic.ContentLines = strings.Count(topic.Content, "\n")
@@ -97,6 +94,8 @@ func ViewTopic(w http.ResponseWriter, r *http.Request, user common.User, urlBit
 			return common.InternalError(err, w, r)
 		}
 		poll = pPoll.Copy()
+		header.AddSheet("chartist/chartist.min.css")
+		header.AddScript("chartist/chartist.min.js")
 	}
 
 	if topic.LikeCount > 0 && user.Liked > 0 {
diff --git a/templates/header.html b/templates/header.html
index 886d5718..522a1fec 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -9,7 +9,6 @@
 		<meta property="x-loggedin" content="{{.CurrentUser.Loggedin}}" />
 		<script type="text/javascript" src="/static/init.js"></script>
 		<script type="text/javascript" src="/static/jquery-3.1.1.min.js"></script>
-		<script type="text/javascript" src="/static/chartist/chartist.min.js"></script>
 		{{range .Header.Scripts}}
 		<script type="text/javascript" src="/static/{{.}}"></script>
 		{{end}}