diff --git a/db/python/layers/analysis.py b/db/python/layers/analysis.py
index 1a28db98b..297145ef8 100644
--- a/db/python/layers/analysis.py
+++ b/db/python/layers/analysis.py
@@ -555,7 +555,8 @@ async def create_analysis(
             project=project,
         )
 
-        await self.ft.create_or_update_analysis_output_files_from_json(analysis_id=new_analysis_id, json_dict=analysis.output)
+        if analysis.output:
+            await self.ft.create_or_update_analysis_output_files_from_json(analysis_id=new_analysis_id, json_dict=analysis.output)
 
         return new_analysis_id
 
diff --git a/test/test_analysis.py b/test/test_analysis.py
index be7a15e90..1b2aba053 100644
--- a/test/test_analysis.py
+++ b/test/test_analysis.py
@@ -153,7 +153,7 @@ async def test_get_analysis(self):
                 meta={},
                 active=True,
                 author=None,
-            )
+            ).copy(update={'output_files': []})
         ]
 
         self.assertEqual(analyses, expected)