diff --git a/app/routers/task/facility_adapter.py b/app/routers/task/facility_adapter.py
index afec203..ed119eb 100644
--- a/app/routers/task/facility_adapter.py
+++ b/app/routers/task/facility_adapter.py
@@ -38,8 +38,11 @@ async def on_task(resource: status_models.Resource, user: account_models.User, t
         # Handle a task from the facility message queue.
         # Returns: (result, status)
         def _extractNull(ind):
-            data = {k: v for k, v in ind.items() if v is not None}
-            return data
+            if hasattr(ind, "model_dump"):
+                data = ind.model_dump()
+            else:
+                data = ind
+            return {k: v for k, v in data.items() if v is not None}
         try:
             r = None
             logger.info(f"Received task: {task.router}:{task.command} with args: {task.args}")