diff --git a/rowers/plannedsessions.py b/rowers/plannedsessions.py
index a896b372..e1be3af1 100644
--- a/rowers/plannedsessions.py
+++ b/rowers/plannedsessions.py
@@ -1064,6 +1064,26 @@ def race_can_submit(r,race):
 
     return False
 
+def race_can_editentry(r,race):
+    start_time = race.start_time
+    start_date = race.startdate
+    startdatetime = datetime.combine(start_date,start_time)
+    startdatetime = pytz.timezone(race.timezone).localize(
+        startdatetime
+        )
+    evaluation_closure = race.evaluation_closure
+
+    if timezone.now() < evaluation_closure:
+        is_complete,has_registered = race_rower_status(r,race)
+        if is_complete == False:
+            return True
+        else:
+            return False
+    else:
+        return False
+
+    return False
+
 def race_can_resubmit(r,race):
     records = VirtualRaceResult.objects.filter(
         userid=r.id,
diff --git a/rowers/views/racesviews.py b/rowers/views/racesviews.py
index 9afa2ffb..e304d20e 100644
--- a/rowers/views/racesviews.py
+++ b/rowers/views/racesviews.py
@@ -3380,7 +3380,7 @@ def virtualevent_entry_edit_view(request,id=0,entryid=0):
     except VirtualRace.DoesNotExist:
         raise Http404("Virtual Challenge does not exist")
 
-    if not race_can_submit(r,race):
+    if not race_can_editentry(r,race):
         messages.error(request,'You cannot change your entries for this challenge')
         url = reverse('virtualevent_view',
                       kwargs={'id':race.id}