diff --git a/packages/hydrooj/src/handler/contest.ts b/packages/hydrooj/src/handler/contest.ts
index 2eac35757..52c1b3cfc 100644
--- a/packages/hydrooj/src/handler/contest.ts
+++ b/packages/hydrooj/src/handler/contest.ts
@@ -331,10 +331,8 @@ export class ContestScoreboardHandler extends ContestDetailBaseHandler {
     async exportScoreboard(domainId: string, tid: ObjectId, ext: string) {
         await this.limitRate('scoreboard_download', 60, 3);
         if (ext === 'ghost') {
-            if ((contest.isDone(this.tdoc) || contest.isLocked(this.tdoc)) && !this.tdoc.unlocked) {
-                if (!this.user.own(this.tdoc)) {
-                    this.checkPerm(PERM.PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD);
-                }
+            if (contest.isLocked(this.tdoc) && !this.user.own(this.tdoc)) {
+                this.checkPerm(PERM.PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD);
             }
             await this.exportGhost(domainId, tid);
             return;
diff --git a/packages/hydrooj/src/handler/record.ts b/packages/hydrooj/src/handler/record.ts
index eeae84d8a..a25e421c8 100644
--- a/packages/hydrooj/src/handler/record.ts
+++ b/packages/hydrooj/src/handler/record.ts
@@ -51,13 +51,14 @@ class RecordListHandler extends ContestDetailBaseHandler {
             this.tdoc = tdoc;
             if (!tdoc) throw new ContestNotFoundError(domainId, pid);
             if (!contest.canShowScoreboard.call(this, tdoc, true)) throw new PermissionError(PERM.PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD);
+            if (!contest.canShowRecord.call(this, tdoc, true)) {
+                throw new PermissionError(PERM.PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD);
+            }
             if (!(await contest.getStatus(domainId, tid, this.user._id))?.attend) {
-                if (contest.canShowRecord.call(this, tdoc, true)) {
-                    const name = tdoc.rule === 'homework'
-                        ? "You haven't claimed this homework yet."
-                        : "You haven't attended this contest yet.";
-                    notification.push({ name, args: { type: 'note' }, checker: () => true });
-                } else throw new ContestNotAttendedError(domainId, tid);
+                const name = tdoc.rule === 'homework'
+                    ? "You haven't claimed this homework yet."
+                    : "You haven't attended this contest yet.";
+                notification.push({ name, args: { type: 'note' }, checker: () => true });
             }
         }
         if (uidOrName) {
@@ -250,7 +251,7 @@ class RecordMainConnectionHandler extends ConnectionHandler {
         if (tid) {
             this.tdoc = await contest.get(domainId, tid);
             if (!this.tdoc) throw new ContestNotFoundError(domainId, tid);
-            if (pretest || contest.canShowScoreboard.call(this, this.tdoc, true)) this.tid = tid.toHexString();
+            if (pretest || contest.canShowScoreboard.call(this, this.tdoc, true, true)) this.tid = tid.toHexString();
             else throw new PermissionError(PERM.PERM_VIEW_CONTEST_HIDDEN_SCOREBOARD);
         }
         if (pretest) {
diff --git a/packages/hydrooj/src/model/contest.ts b/packages/hydrooj/src/model/contest.ts
index f7218f4a2..3e20f3e6b 100644
--- a/packages/hydrooj/src/model/contest.ts
+++ b/packages/hydrooj/src/model/contest.ts
@@ -53,7 +53,8 @@ const acm = buildContestRule({
     submitAfterAccept: false,
     showScoreboard: (tdoc, now) => now > tdoc.beginAt,
     showSelfRecord: () => true,
-    showRecord: (tdoc, now) => now > tdoc.endAt,
+    // eslint-disable-next-line @typescript-eslint/no-use-before-define
+    showRecord: (tdoc, now) => now > tdoc.endAt && !isLocked(tdoc),
     stat(tdoc, journal: AcmJournal[]) {
         const naccept = Counter<number>();
         const npending = Counter<number>();
@@ -245,7 +246,8 @@ const oi = buildContestRule({
     },
     showScoreboard: (tdoc, now) => now > tdoc.endAt,
     showSelfRecord: (tdoc, now) => now > tdoc.endAt,
-    showRecord: (tdoc, now) => now > tdoc.endAt,
+    // eslint-disable-next-line @typescript-eslint/no-use-before-define
+    showRecord: (tdoc, now) => now > tdoc.endAt && !isLocked(tdoc),
     async scoreboardHeader(config, _, tdoc, pdict) {
         const columns: ScoreboardNode[] = [
             { type: 'rank', value: '#' },
@@ -781,7 +783,7 @@ export function isDone(tdoc: Tdoc, tsdoc?: any) {
 export function isLocked(tdoc: Tdoc) {
     if (!tdoc.lockAt) return false;
     const now = new Date();
-    return (tdoc.lockAt < now && now < tdoc.endAt);
+    return tdoc.lockAt < now && !tdoc.unlocked;
 }
 
 export function isExtended(tdoc: Tdoc) {
diff --git a/packages/ui-default/templates/partials/scoreboard.html b/packages/ui-default/templates/partials/scoreboard.html
index 40d4d5767..c71caee0b 100644
--- a/packages/ui-default/templates/partials/scoreboard.html
+++ b/packages/ui-default/templates/partials/scoreboard.html
@@ -10,13 +10,11 @@
   {% if model.contest.isLocked(tdoc) %}
     <div class="section__body no-padding">
       <blockquote class="note">
-        {{ _('The scoreboard was frozen with {0} minutes remaining at {1} - submissions in the last {0} minutes of the contest are still shown as pending.').format((tdoc.endAt - tdoc.lockAt) / 1000 / 60, datetimeSpan(tdoc.lockAt))|safe }}
-      </blockquote>
-    </div>
-  {% elif model.contest.isDone(tdoc) and tdoc.lockAt and not tdoc.unlocked %}
-    <div class="section__body no-padding">
-      <blockquote class="note">
-        {{ _('Please wait until contest host unfreeze the scoreboard.') }}
+        {% if model.contest.isDone(tdoc) %}
+          {{ _('Please wait until contest host unfreeze the scoreboard.') }}
+        {% else %}
+          {{ _('The scoreboard was frozen with {0} minutes remaining at {1} - submissions in the last {0} minutes of the contest are still shown as pending.').format((tdoc.endAt - tdoc.lockAt) / 1000 / 60, datetimeSpan(tdoc.lockAt))|safe }}
+        {% endif %}
       </blockquote>
     </div>
   {% endif %}