diff --git a/src/pretix/base/pdf.py b/src/pretix/base/pdf.py
index 410a610caa..889a7c4e34 100644
--- a/src/pretix/base/pdf.py
+++ b/src/pretix/base/pdf.py
@@ -434,7 +434,7 @@ def images_from_questions(sender, *args, **kwargs):
             except IndexError:
                 pass
         else:
-            a = op.answers.filter(question_id=question_id).first()
+            a = op.answers.filter(question_id=question_id).first() or a
 
         if not a or not a.file or not any(a.file.name.lower().endswith(e) for e in (".jpg", ".jpeg", ".png", ".gif", ".bmp", ".tif", ".tiff")):
             return None
@@ -474,7 +474,7 @@ def variables_from_questions(sender, *args, **kwargs):
             except IndexError:
                 pass
         else:
-            a = op.answers.filter(question_id=question_id).first()
+            a = op.answers.filter(question_id=question_id).first() or a
 
         if not a:
             return ""