diff --git a/rapids/views.py b/rapids/views.py
index f467ea29..3d749b79 100755
--- a/rapids/views.py
+++ b/rapids/views.py
@@ -240,6 +240,7 @@ class RapidCreateBase(LoginRequiredMixin, CreateView):
                                                     self.request.FILES)
         else:
             context['image_formset'] = ImageFormSet()
+        context['answer_formset'] = AnswerFormSet()
         return context
 
     def form_valid(self, form):
@@ -311,10 +312,9 @@ class RapidUpdate(LoginRequiredMixin, AuthorOrCheckerRequiredMixin,
                                                     self.request.FILES,
                                                     instance=self.object)
             context['image_formset'].full_clean()
-            context['answer_formset'] = AnswerFormSet(instance=self.object)
         else:
             context['image_formset'] = ImageFormSet(instance=self.object)
-            context['answer_formset'] = AnswerFormSet(instance=self.object)
+        context['answer_formset'] = AnswerFormSet(instance=self.object)
         return context
 
     def form_valid(self, form):