diff --git a/ippisite/ippidb/views.py b/ippisite/ippidb/views.py
index 3d63a0a52eb20f7a4fe1a86c0ecde47e4862c188..00ea6df6519d097da0ec1bb5404a980bc9b14f96 100644
--- a/ippisite/ippidb/views.py
+++ b/ippisite/ippidb/views.py
@@ -74,8 +74,9 @@ class IppiWizard(NamedUrlSessionWizardView):
 
     def get_context_data(self, **kwargs):
         context=super(IppiWizard, self).get_context_data(**kwargs)
-        context['complex_type']=self.storage.get_step_data('ProteinDomainComplexTypeForm').get('complex_type')
-        context['complex_choice']=self.storage.get_step_data('ProteinDomainComplexTypeForm').get('complex_choice')
+        if self.steps.current == 'ProteinDomainComplexForm':
+            context['complex_type']=self.storage.get_step_data('ProteinDomainComplexTypeForm').get('complex_type')
+            context['complex_choice']=self.storage.get_step_data('ProteinDomainComplexTypeForm').get('complex_choice')
         return context 
 
     def get_template_names(self):