diff --git a/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx b/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx
index 78799a23f..d555d94f9 100644
--- a/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx
+++ b/app/assets/javascripts/Components/AttachedFilesPopover/AttachedFilesButton.tsx
@@ -210,10 +210,15 @@ export const AttachedFilesButton: FunctionComponent<Props> = observer(
         case PopoverFileItemActionType.RenameFile:
           await renameFile(file, action.payload.name)
           break
-        case PopoverFileItemActionType.PreviewFile:
+        case PopoverFileItemActionType.PreviewFile: {
           keepMenuOpen(true)
-          appState.filePreviewModal.activate(file, currentTab === PopoverTabs.AllFiles ? allFiles : attachedFiles)
+          const otherFiles = currentTab === PopoverTabs.AllFiles ? allFiles : attachedFiles
+          appState.filePreviewModal.activate(
+            file,
+            otherFiles.filter((file) => !file.protected),
+          )
           break
+        }
       }
 
       if (
diff --git a/app/assets/javascripts/Components/Files/FilePreviewModal.tsx b/app/assets/javascripts/Components/Files/FilePreviewModal.tsx
index 2fe6eccaf..42635ecc8 100644
--- a/app/assets/javascripts/Components/Files/FilePreviewModal.tsx
+++ b/app/assets/javascripts/Components/Files/FilePreviewModal.tsx
@@ -69,6 +69,7 @@ export const FilePreviewModal: FunctionComponent<Props> = observer(({ applicatio
     setIsFilePreviewable(isPreviewable)
 
     if (!isPreviewable) {
+      setObjectUrl('')
       setIsLoadingFile(false)
     }