diff --git a/lbrynet/wallet/database.py b/lbrynet/wallet/database.py
index 4c94e34c2..219dc5beb 100644
--- a/lbrynet/wallet/database.py
+++ b/lbrynet/wallet/database.py
@@ -40,6 +40,10 @@ class WalletDatabase(BaseDatabase):
         })
         if txo.script.is_claim_involved:
             row['claim_name'] = txo.script.values['claim_name']
+        if txo.script.is_update_claim or txo.script.is_support_claim:
+            row['claim_id'] = sqlite3.Binary(txo.script.values['claim_id'])
+        else:
+            row['claim_id'] = sqlite3.Binary(tx.get_claim_id(txo.index))
         return row
 
     @defer.inlineCallbacks
diff --git a/lbrynet/wallet/manager.py b/lbrynet/wallet/manager.py
index 274981381..f21dc4e93 100644
--- a/lbrynet/wallet/manager.py
+++ b/lbrynet/wallet/manager.py
@@ -60,7 +60,7 @@ class LbryWalletManager(BaseWalletManager):
             'default_servers': settings['lbryum_servers'],
             'data_path': settings['lbryum_wallet_dir'],
             'use_keyring': settings['use_keyring'],
-            'db': db
+            #'db': db
         }
 
         wallet_file_path = os.path.join(settings['lbryum_wallet_dir'], 'default_wallet')