diff --git a/lib/nntp/tiny/db.py b/lib/nntp/tiny/db.py
index c372d19..044f0af 100644
--- a/lib/nntp/tiny/db.py
+++ b/lib/nntp/tiny/db.py
@@ -96,7 +96,10 @@ class Database():
         return cr
 
     def query(self, table, values=dict(), order_by=list()):
-        sql = f"select * from {table.name}"
+        sql = "select %s from %s" % (
+            ', '.join(table.columns),
+            table.name
+        )
 
         if len(values) > 0:
             sql += " where "