diff --git a/ietf/nomcom/tests.py b/ietf/nomcom/tests.py
index fb7696e95..973208a85 100644
--- a/ietf/nomcom/tests.py
+++ b/ietf/nomcom/tests.py
@@ -1741,8 +1741,6 @@ class NoPublicKeyTests(TestCase):
         self.do_common_work(reverse('ietf.nomcom.views.private_feedback_email',kwargs={'year':self.nc.year()}),False)
         # No questionnaire responses
         self.do_common_work(reverse('ietf.nomcom.views.private_questionnaire',kwargs={'year':self.nc.year()}),False)
-        # Warn on edit nomcom
-        self.do_common_work(reverse('ietf.nomcom.views.edit_nomcom',kwargs={'year':self.nc.year()}),True)
 
 class MergePersonTests(TestCase):
     def setUp(self):
diff --git a/ietf/nomcom/views.py b/ietf/nomcom/views.py
index 85b3d8405..b970a3156 100644
--- a/ietf/nomcom/views.py
+++ b/ietf/nomcom/views.py
@@ -108,11 +108,6 @@ def announcements(request):
 def private_key(request, year):
     nomcom = get_nomcom_by_year(year)
     
-    if request.session.get('NOMCOM_PRIVATE_KEY_%s' % year, None):
-        messages.warning(request, 'You already have a private decryption key set for this session.')
-    else:
-        messages.warning(request, "You don't have a private decryption key set for this session yet")
-
     back_url = request.GET.get('back_to', reverse('ietf.nomcom.views.private_index', None, args=(year, )))
     if request.method == 'POST':
         form = PrivateKeyForm(data=request.POST)
@@ -121,6 +116,12 @@ def private_key(request, year):
             return HttpResponseRedirect(back_url)
     else:
         form = PrivateKeyForm()
+
+    if request.session.get('NOMCOM_PRIVATE_KEY_%s' % year, None):
+        messages.warning(request, 'You already have a private decryption key set for this session.')
+    else:
+        messages.warning(request, "You don't have a private decryption key set for this session yet")
+
     return render(request, 'nomcom/private_key.html',
                               {'nomcom': nomcom,
                                'year': year,
@@ -832,11 +833,6 @@ def edit_nominee(request, year, nominee_id):
 def edit_nomcom(request, year):
     nomcom = get_nomcom_by_year(year)
 
-    if nomcom.public_key:
-        messages.warning(request,  'Previous data will remain encrypted with the old key')
-    else:
-        messages.warning(request, 'This Nomcom does not yet have a public key')
-
     ReminderDateInlineFormSet = inlineformset_factory(parent_model=NomCom,
                                                       model=ReminderDates,
                                                       form=ReminderDatesForm)