diff --git a/src/src/app/modals/trip-notes-modal/trip-notes-modal.component.html b/src/src/app/modals/trip-notes-modal/trip-notes-modal.component.html
index 1c07c5b..a737d63 100644
--- a/src/src/app/modals/trip-notes-modal/trip-notes-modal.component.html
+++ b/src/src/app/modals/trip-notes-modal/trip-notes-modal.component.html
@@ -24,7 +24,7 @@
     <p-button (click)="closeDialog()" [disabled]="notes.pristine" label="Confirm" />
     } @else {
     <div></div>
-    <p-button text label="Edit" icon="pi pi-pencil" (click)="toggleEditing()" />
+    <p-button text label="Edit" [disabled]="isArchived" icon="pi pi-pencil" (click)="toggleEditing()" />
     }
   </div>
 </section>
\ No newline at end of file
diff --git a/src/src/app/modals/trip-notes-modal/trip-notes-modal.component.ts b/src/src/app/modals/trip-notes-modal/trip-notes-modal.component.ts
index 941af82..15b3fd4 100644
--- a/src/src/app/modals/trip-notes-modal/trip-notes-modal.component.ts
+++ b/src/src/app/modals/trip-notes-modal/trip-notes-modal.component.ts
@@ -14,6 +14,7 @@ import { TextareaModule } from 'primeng/textarea';
 })
 export class TripNotesModalComponent {
   notes = new FormControl('');
+  isArchived = false;
   isEditing: boolean = false;
 
   constructor(
@@ -21,7 +22,8 @@ export class TripNotesModalComponent {
     private config: DynamicDialogConfig,
   ) {
     if (this.config.data) {
-      this.notes.setValue(this.config.data);
+      if (this.config.data.notes) this.notes.setValue(this.config.data.notes);
+      this.isArchived = this.config.data.archived;
     }
   }