diff --git a/plantit/plantit/queries.py b/plantit/plantit/queries.py
index f351397a..64c3cab4 100644
--- a/plantit/plantit/queries.py
+++ b/plantit/plantit/queries.py
@@ -755,8 +755,8 @@ def migration_to_dict(migration: Migration) -> dict:
         'completed': None if migration.completed is None else migration.completed.isoformat(),
         'target_path': migration.target_path,
         'num_folders': migration.num_folders,
-        'storage': json.loads(migration.storage),
-        'uploads': json.loads(migration.uploads)
+        'storage': json.loads(migration.storage if migration.storage is not None else '[]'),
+        'uploads': json.loads(migration.uploads if migration.uploads is not None else '[]')
     }