diff --git a/templates/index.html b/templates/index.html
index 1f459483..58529230 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -10,7 +10,8 @@
 </head>
 <body>
 	<h1>{board[url]} - {board[name]}</h1>
-	<div class="title">{board[title]}</div>
+	<div class="title">{board[title]?{board[title]}}</div>
+	
 	<form onsubmit="return dopost(this);" enctype="multipart/form-data" action="{post_url}" method="post">
 		<table>
 			<tr>
diff --git a/templates/thread.html b/templates/thread.html
index d78ca3f1..f0f271b7 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -10,7 +10,8 @@
 </head>
 <body>
 	<h1>{board[url]} - {board[name]}</h1>
-	<div class="title">{board[title]}</div>
+	<div class="title">{board[title]?{board[title]}}</div>
+	
 	<div class="banner">Posting mode: Reply <a class="unimportant" href="{index}{board[dir]}">[Return.]</a></div>
 	<form onsubmit="return dopost(this);" enctype="multipart/form-data" action="{post_url}" method="post">
 	<input type="hidden" name="thread" value="{id}" />
