diff --git a/lbrynet/extras/daemon/storage.py b/lbrynet/extras/daemon/storage.py
index d3826530b..3ae395c3e 100644
--- a/lbrynet/extras/daemon/storage.py
+++ b/lbrynet/extras/daemon/storage.py
@@ -147,11 +147,11 @@ def get_all_lbry_files(transaction: sqlite3.Connection) -> typing.List[typing.Di
                 "claim": claim
             }
         )
-    for claim_id in signed_claims.keys():
-        channel_name = transaction.execute("select claim_name from claim where claim_id=?", (claim_id, )).fetchone()
-        if channel_name:
-            for claim in signed_claims[claim_id]:
-                claim.channel_name = channel_name[0]
+    for claim_name, claim_id in _batched_select(
+            transaction, "select c.claim_name, c.claim_id from claim c where c.claim_id in {}",
+            list(signed_claims.keys())):
+        for claim in signed_claims[claim_id]:
+            claim.channel_name = claim_name
     return files
 
 
diff --git a/tests/unit/wallet/test_account.py b/tests/unit/wallet/test_account.py
index 92a8a7fb3..c0b9f99fd 100644
--- a/tests/unit/wallet/test_account.py
+++ b/tests/unit/wallet/test_account.py
@@ -73,6 +73,7 @@ class TestAccount(AsyncioTestCase):
     def test_load_and_save_account(self):
         account_data = {
             'name': 'Main Account',
+            'modified_on': 123.456,
             'seed':
                 "carbon smart garage balance margin twelve chest sword toast envelope bottom stomac"
                 "h absent",