diff --git a/datasette/views/table.py b/datasette/views/table.py
index 326c11ae..139ff80b 100644
--- a/datasette/views/table.py
+++ b/datasette/views/table.py
@@ -235,13 +235,17 @@ class TableView(RowTableShared):
             raise NotFound("Table not found: {}".format(table))
 
         pks = await db.primary_keys(table)
+        table_columns = await db.table_columns(table)
+
+        select_columns = ", ".join(escape_sqlite(t) for t in table_columns)
+
         use_rowid = not pks and not is_view
         if use_rowid:
-            select = "rowid, *"
+            select = "rowid, {}".format(select_columns)
             order_by = "rowid"
             order_by_pks = "rowid"
         else:
-            select = "*"
+            select = select_columns
             order_by_pks = ", ".join([escape_sqlite(pk) for pk in pks])
             order_by = order_by_pks
 
diff --git a/tests/test_api.py b/tests/test_api.py
index c6acbab1..4a09b238 100644
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@ -610,7 +610,8 @@ def test_table_json(app_client):
     assert response.status == 200
     data = response.json
     assert (
-        data["query"]["sql"] == "select * from simple_primary_key order by id limit 51"
+        data["query"]["sql"]
+        == "select id, content from simple_primary_key order by id limit 51"
     )
     assert data["query"]["params"] == {}
     assert data["rows"] == [