diff --git a/datasette/templates/database.html b/datasette/templates/database.html
index 0c9452ea..b0aff691 100644
--- a/datasette/templates/database.html
+++ b/datasette/templates/database.html
@@ -59,7 +59,7 @@
     {% for row in rows %}
         <tr>
             {% for td in row %}
-                <td>{{ td or "&nbsp;"|safe }}</td>
+                <td>{% if td == None %}{{ "&nbsp;"|safe }}{% else %}{{ td }}{% endif %}</td>
             {% endfor %}
         </tr>
     {% endfor %}