diff --git a/app/shot-on/[make]/[model]/image/route.tsx b/app/shot-on/[make]/[model]/image/route.tsx
index 90d00979..658a8efb 100644
--- a/app/shot-on/[make]/[model]/image/route.tsx
+++ b/app/shot-on/[make]/[model]/image/route.tsx
@@ -15,7 +15,7 @@ export const generateStaticParams = staticallyGenerateCategoryIfConfigured(
   'cameras',
   'image',
   getUniqueCameras,
-  cameras => cameras.map(({ camera }) => camera),
+  cameras => cameras.map(({ camera }) => formatCameraParams(camera)),
 );
 
 export async function GET(
diff --git a/app/shot-on/[make]/[model]/page.tsx b/app/shot-on/[make]/[model]/page.tsx
index b25a0553..cb597b0b 100644
--- a/app/shot-on/[make]/[model]/page.tsx
+++ b/app/shot-on/[make]/[model]/page.tsx
@@ -1,5 +1,5 @@
 import { Metadata } from 'next/types';
-import { CameraProps } from '@/camera';
+import { CameraProps, formatCameraParams } from '@/camera';
 import { generateMetaForCamera } from '@/camera/meta';
 import { INFINITE_SCROLL_GRID_INITIAL } from '@/photo';
 import { getPhotosCameraDataCached } from '@/camera/data';
@@ -21,7 +21,7 @@ export const generateStaticParams = staticallyGenerateCategoryIfConfigured(
   'cameras',
   'page',
   getUniqueCameras,
-  cameras => cameras.map(({ camera }) => camera),
+  cameras => cameras.map(({ camera }) => formatCameraParams(camera)),
 );
 
 export async function generateMetadata({
diff --git a/src/lens/index.ts b/src/lens/index.ts
index 3242d424..21393026 100644
--- a/src/lens/index.ts
+++ b/src/lens/index.ts
@@ -51,8 +51,8 @@ export const safelyGenerateLensStaticParams = (
   lenses: Lenses,
 ) =>
   lenses.map(({ lens: { make, model } }) => ({
-    make: make ?? MISSING_FIELD,
-    model,
+    make: make ? parameterize(make) : MISSING_FIELD,
+    model: parameterize(model),
   }));
 
 // Support keys for make-only and model-only lens queries