diff --git a/squeakserver/server/postgres_db.py b/squeakserver/server/postgres_db.py
index db4dc8cf..b7181f3d 100644
--- a/squeakserver/server/postgres_db.py
+++ b/squeakserver/server/postgres_db.py
@@ -99,6 +99,9 @@ class PostgresDb():
         addresses_tuple = tuple(addresses)
         logger.info("Lookup query with addresses tuple: " + str(addresses_tuple))
 
+        if not addresses:
+            return []
+
         with psycopg2.connect(**self.params) as conn:
             with conn.cursor() as curs:
                 # mogrify to debug.