diff --git a/projects/gameboard-ui/src/app/feedback/components/feedback-submission-form/feedback-submission-form.component.html b/projects/gameboard-ui/src/app/feedback/components/feedback-submission-form/feedback-submission-form.component.html
index 79331786..cc4bac37 100644
--- a/projects/gameboard-ui/src/app/feedback/components/feedback-submission-form/feedback-submission-form.component.html
+++ b/projects/gameboard-ui/src/app/feedback/components/feedback-submission-form/feedback-submission-form.component.html
@@ -7,7 +7,7 @@
             <small><span class="font-weight-bold align-middle">{{template?.helpText}}</span></small>
         </div>
 
-        <ng-container *ngIf="!submission.whenFinalized; else finalized">
+        <ng-container *ngIf="!submission.whenFinalized && !isAdminView; else finalized">
             <div *ngFor="let q of submission.responses; let i = index" class="mb-4">
                 <label for="{{q.id}}">
                     <div class="d-flex">
diff --git a/projects/gameboard-ui/src/app/reports/components/reports/feedback-report/feedback-report.component.html b/projects/gameboard-ui/src/app/reports/components/reports/feedback-report/feedback-report.component.html
index d7e8d292..69855b41 100644
--- a/projects/gameboard-ui/src/app/reports/components/reports/feedback-report/feedback-report.component.html
+++ b/projects/gameboard-ui/src/app/reports/components/reports/feedback-report/feedback-report.component.html
@@ -107,11 +107,3 @@
 </ng-template>
 <ng-template #noValue>--</ng-template>
 <ng-template #loading><app-spinner>Loading player feedback...</app-spinner></ng-template>
-
-<ng-template #playerResponsesModal let-context>
-    {{ context | json }}
-    <!-- <app-modal-content title="Feedback" [subtitle]="context.user.name">
-        <app-feedback-submission-form [templateId]="ctx.parameters.templateId"
-            [feedbackEntity]="context.entity"></app-feedback-submission-form>
-    </app-modal-content> -->
-</ng-template>
diff --git a/projects/gameboard-ui/src/app/reports/components/reports/feedback-report/feedback-report.component.ts b/projects/gameboard-ui/src/app/reports/components/reports/feedback-report/feedback-report.component.ts
index 7d59cc7e..48d73f81 100644
--- a/projects/gameboard-ui/src/app/reports/components/reports/feedback-report/feedback-report.component.ts
+++ b/projects/gameboard-ui/src/app/reports/components/reports/feedback-report/feedback-report.component.ts
@@ -77,15 +77,13 @@ export class FeedbackReportComponent extends ReportComponentBase<FeedbackReportP
   };
 
   protected handleRecordClick(record: FeedbackReportRecord) {
-    if (this.playerResponsesModalTemplate) {
-      this.modalService.openComponent({
-        content: PlayerFeedbackResponsesModalComponent,
-        context: {
-          record,
-          templateId: this.ctx.parameters.templateId
-        }
-      });
-    }
+    this.modalService.openComponent({
+      content: PlayerFeedbackResponsesModalComponent,
+      context: {
+        record,
+        templateId: this.ctx.parameters.templateId
+      }
+    });
   }
 
   protected async updateView(parameters: FeedbackReportParameters): Promise<ReportViewUpdate> {
diff --git a/projects/gameboard-ui/src/app/reports/components/reports/feedback-report/player-feedback-responses-modal/player-feedback-responses-modal.component.html b/projects/gameboard-ui/src/app/reports/components/reports/feedback-report/player-feedback-responses-modal/player-feedback-responses-modal.component.html
index 598371f3..051bf1d3 100644
--- a/projects/gameboard-ui/src/app/reports/components/reports/feedback-report/player-feedback-responses-modal/player-feedback-responses-modal.component.html
+++ b/projects/gameboard-ui/src/app/reports/components/reports/feedback-report/player-feedback-responses-modal/player-feedback-responses-modal.component.html
@@ -1,4 +1,4 @@
-<app-modal-content *ngIf="record" title="Feedback" [subtitle]="record.user.name">
+<app-modal-content *ngIf="record" title="Feedback" [subtitle]="record.user.name" [hideCancel]="true">
     <app-feedback-submission-form [templateId]="templateId" [isAdminView]="true"
         [feedbackEntity]="record.entity"></app-feedback-submission-form>
 </app-modal-content>