diff --git a/app/models/user.rb b/app/models/user.rb
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -209,7 +209,13 @@
   def contest_finished?
     if Configuration.contest_mode?
       return false if site==nil
-      return site.finished?
+      if site.finished?
+        return true
+      elsif codejom_status!=nil
+        return (not codejom_status.alive)
+      else
+        return false
+      end
     elsif Configuration.indv_contest_mode?
       time_limit = Configuration.contest_time_limit