diff --git a/web/apps/photos/src/components/PhotoFrame.tsx b/web/apps/photos/src/components/PhotoFrame.tsx
index af3b5aa8e7..49985f404a 100644
--- a/web/apps/photos/src/components/PhotoFrame.tsx
+++ b/web/apps/photos/src/components/PhotoFrame.tsx
@@ -518,7 +518,7 @@ const PhotoFrame = ({
                     />
                 )}
             </AutoSizer>
-            {process.env.NEXT_ENTE_WIP_PS5 && <FileViewer />}
+            {process.env.NEXT_PUBLIC_ENTE_WIP_PS5 && <FileViewer />}
             <PhotoViewer
                 isOpen={open}
                 items={displayFiles}
diff --git a/web/packages/new/photos/components/FileViewer5.tsx b/web/packages/new/photos/components/FileViewer5.tsx
index fbd9959dbb..f2cca4a5f7 100644
--- a/web/packages/new/photos/components/FileViewer5.tsx
+++ b/web/packages/new/photos/components/FileViewer5.tsx
@@ -2,12 +2,20 @@
 //
 // Needs yarn workspace gallery add photoswipe@^5.4.4 (not committed yet).
 
+if (process.env.NEXT_PUBLIC_ENTE_WIP_PS5) {
+    console.warn("Using WIP upstream photoswipe");
+} else {
+    throw new Error("Whoa");
+}
+
 import { Button } from "@mui/material";
 
-export const FileViewer: React.FC = () => {
+const FileViewer: React.FC = () => {
     return (
         <div>
             Hello<Button>Test</Button>
         </div>
     );
 };
+
+export default FileViewer;
diff --git a/web/packages/new/photos/components/PhotoViewer.tsx b/web/packages/new/photos/components/PhotoViewer.tsx
index 82dd388e7b..1f6806696e 100644
--- a/web/packages/new/photos/components/PhotoViewer.tsx
+++ b/web/packages/new/photos/components/PhotoViewer.tsx
@@ -13,11 +13,11 @@ import { aboveGalleryContentZ } from "./utils/z-index";
 import dynamic from "next/dynamic";
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
-const FV5 = dynamic(() => import("./FileViewer5"));
+const FV5 = dynamic(() => import("./FileViewer5"), { ssr: false });
 const FVD = () => <></>;
 
 export const FileViewer: React.FC = (props) => {
-    return process.env.NEXT_ENTE_WIP_PS5 ? <FV5 {...props} /> : <FVD />;
+    return process.env.NEXT_PUBLIC_ENTE_WIP_PS5 ? <FV5 {...props} /> : <FVD />;
 };
 
 type ConfirmDeleteFileDialogProps = ModalVisibilityProps & {