diff --git a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
index e9b4c25e..01aa9679 100644
--- a/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
+++ b/furniture-3d-system/src/app/intake/non-integrated/NonIntegratedDetailClient.tsx
@@ -536,6 +536,7 @@ import {
 } from "./previewHoleHelpers";
 import { inferUploadCategory } from "./uploadCategoryHelpers";
 import { productHasLocalAssets } from "./localAssetHelpers";
+import { shouldUseRemoteAssetStorage } from "./uploadStorageHelpers";
 import {
   buildFinishedSampleShipmentRows,
   buildSampleMeasurementRows,
@@ -4556,21 +4557,6 @@ function createInitialDocumentWorkspaceApprovedAt(
   return approvedAt;
 }
 
-type NonIntegratedRemoteAssetStorageTestGlobal = typeof globalThis & {
-  __NON_INTEGRATED_REMOTE_ASSET_STORAGE_TEST_OVERRIDE__?: boolean;
-};
-
-function shouldUseRemoteAssetStorage() {
-  if (process.env.NODE_ENV === "test") {
-    return (
-      (globalThis as NonIntegratedRemoteAssetStorageTestGlobal)
-        .__NON_INTEGRATED_REMOTE_ASSET_STORAGE_TEST_OVERRIDE__ === true
-    );
-  }
-
-  return true;
-}
-
 const NON_INTEGRATED_IMAGE_UPLOAD_MAX_DIMENSION = 2048;
 
 function nonIntegratedImageUploadFileName(file: File) {
diff --git a/furniture-3d-system/src/app/intake/non-integrated/uploadStorageHelpers.ts b/furniture-3d-system/src/app/intake/non-integrated/uploadStorageHelpers.ts
new file mode 100644
index 00000000..5d3bb2a6
--- /dev/null
+++ b/furniture-3d-system/src/app/intake/non-integrated/uploadStorageHelpers.ts
@@ -0,0 +1,14 @@
+type NonIntegratedRemoteAssetStorageTestGlobal = typeof globalThis & {
+  __NON_INTEGRATED_REMOTE_ASSET_STORAGE_TEST_OVERRIDE__?: boolean;
+};
+
+export function shouldUseRemoteAssetStorage() {
+  if (process.env.NODE_ENV === "test") {
+    return (
+      (globalThis as NonIntegratedRemoteAssetStorageTestGlobal)
+        .__NON_INTEGRATED_REMOTE_ASSET_STORAGE_TEST_OVERRIDE__ === true
+    );
+  }
+
+  return true;
+}