diff --git a/atlas/views.py b/atlas/views.py
index 8af7a45c..f3c37e0a 100755
--- a/atlas/views.py
+++ b/atlas/views.py
@@ -388,11 +388,10 @@ def user_uploads(request, case_id: int | None = None):
 
     data = defaultdict(list)
     for d in dicoms:
-        if not d.basic_dicom_tags:
-            d.basic_dicom_tags = tags = d.get_basic_dicom_tags()
+        if d.basic_dicom_tags is None or not d.basic_dicom_tags:
+            d.basic_dicom_tags = d.get_basic_dicom_tags()
             d.save()
-        else:
-            tags = d.basic_dicom_tags
+        tags = d.basic_dicom_tags
 
 
         data[tags["SeriesInstanceUID"]].append((tags, d.created_date))