diff --git a/desktop/CHANGELOG.md b/desktop/CHANGELOG.md
index a119f38c3e..22d6ad2309 100644
--- a/desktop/CHANGELOG.md
+++ b/desktop/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## v1.7.14 (Unreleased)
 
+- Increase file size limit to 10 GB.
 - .
 
 ## v1.7.13
diff --git a/web/apps/photos/src/components/Sidebar.tsx b/web/apps/photos/src/components/Sidebar.tsx
index 4a8d4ccdc6..6af8de34da 100644
--- a/web/apps/photos/src/components/Sidebar.tsx
+++ b/web/apps/photos/src/components/Sidebar.tsx
@@ -7,7 +7,6 @@ import HealthAndSafetyIcon from "@mui/icons-material/HealthAndSafety";
 import InfoOutlinedIcon from "@mui/icons-material/InfoOutlined";
 import LockOutlinedIcon from "@mui/icons-material/LockOutlined";
 import NorthEastIcon from "@mui/icons-material/NorthEast";
-import ScienceIcon from "@mui/icons-material/Science";
 import VisibilityOffIcon from "@mui/icons-material/VisibilityOff";
 import {
     Box,
@@ -34,7 +33,6 @@ import {
     RowButtonEndActivityIndicator,
     RowButtonGroup,
     RowButtonGroupHint,
-    RowButtonGroupTitle,
     RowSwitch,
 } from "ente-base/components/RowButton";
 import { SpacedRow } from "ente-base/components/containers";
@@ -805,18 +803,13 @@ const Preferences: React.FC<NestedSidebarDrawerVisibilityProps> = ({
                     onClick={showAdvancedSettings}
                 />
                 {isHLSGenerationSupported && (
-                    <Stack>
-                        <RowButtonGroupTitle icon={<ScienceIcon />}>
-                            {t("labs")}
-                        </RowButtonGroupTitle>
-                        <RowButtonGroup>
-                            <RowSwitch
-                                label={t("streamable_videos")}
-                                checked={isHLSGenerationEnabled}
-                                onClick={() => void toggleHLSGeneration()}
-                            />
-                        </RowButtonGroup>
-                    </Stack>
+                    <RowButtonGroup>
+                        <RowSwitch
+                            label={t("streamable_videos")}
+                            checked={isHLSGenerationEnabled}
+                            onClick={() => void toggleHLSGeneration()}
+                        />
+                    </RowButtonGroup>
                 )}
             </Stack>
             <MapSettings
diff --git a/web/packages/gallery/services/upload/upload-service.ts b/web/packages/gallery/services/upload/upload-service.ts
index 1e71f1bf1a..d4d7390c1c 100644
--- a/web/packages/gallery/services/upload/upload-service.ts
+++ b/web/packages/gallery/services/upload/upload-service.ts
@@ -45,7 +45,6 @@ import {
 import { FileType, type FileTypeInfo } from "ente-media/file-type";
 import { encodeLivePhoto } from "ente-media/live-photo";
 import { addToCollection } from "ente-new/photos/services/collection";
-import { settingsSnapshot } from "ente-new/photos/services/settings";
 import {
     CustomError,
     CustomErrorMessage,
@@ -648,10 +647,7 @@ export const upload = async (
 
         const { fileTypeInfo, fileSize, lastModifiedMs } = assetDetails;
 
-        // TODO(REL):
-        const maxFileSize = settingsSnapshot().isInternalUser
-            ? 10 * 1024 * 1024 * 1024 /* 10 GB */
-            : 4 * 1024 * 1024 * 1024; /* 4 GB */
+        const maxFileSize = 10 * 1024 * 1024 * 1024; /* 10 GB */
         if (fileSize >= maxFileSize) return { uploadResult: "tooLarge" };
 
         abortIfCancelled();
diff --git a/web/packages/gallery/services/video.ts b/web/packages/gallery/services/video.ts
index 93c5e9fc63..7a17e90c8e 100644
--- a/web/packages/gallery/services/video.ts
+++ b/web/packages/gallery/services/video.ts
@@ -208,7 +208,7 @@ const updateSnapshotIfNeeded = (
 export const isHLSGenerationSupported = isDesktop;
 
 /**
- * Initialize the video processing subsystem if the user has enabled HLS
+ * Initialize the video processing subsystem unless the user has disabled HLS
  * generation in settings.
  */
 export const initVideoProcessing = async () => {
@@ -224,8 +224,10 @@ export const initVideoProcessing = async () => {
 
 /**
  * Return the persisted user preference for HLS generation.
+ *
+ * If unset, defaults to `true`.
  */
-const savedGenerateHLS = () => getKVB("generateHLS");
+const savedGenerateHLS = async () => (await getKVB("generateHLS")) ?? true;
 
 /**
  * Update the persisted user preference for HLS generation.