diff --git a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/SingleLogEntryDisplayController.java b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/SingleLogEntryDisplayController.java
index 2ef0956433..ba6960d68f 100644
--- a/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/SingleLogEntryDisplayController.java
+++ b/app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/SingleLogEntryDisplayController.java
@@ -188,7 +188,14 @@ private void fetchAttachments() {
             Collection<Attachment> attachments = logEntry.getAttachments().stream()
                     .filter((attachment) -> attachment.getName() != null && !attachment.getName().isEmpty())
                     .map((attachment) -> {
-                        OlogAttachment fileAttachment = new OlogAttachment();
+                        OlogAttachment fileAttachment = new OlogAttachment() {
+                            @Override
+                            protected void finalize() {
+                                if (getFile() != null && getFile().exists()) {
+                                    getFile().delete();
+                                }
+                            }
+                        };
                         fileAttachment.setContentType(attachment.getContentType());
                         fileAttachment.setThumbnail(false);
                         fileAttachment.setFileName(attachment.getName());