diff --git a/components/product/sustainability-info.tsx b/components/product/sustainability-info.tsx
index 0932542bf..727ebcc00 100644
--- a/components/product/sustainability-info.tsx
+++ b/components/product/sustainability-info.tsx
@@ -18,7 +18,7 @@ export function SustainabilityInfo() {
               <AccordionItem id={credential} key={credential} value={credential}>
                 <AccordionTrigger className="text-xs py-3">{credentials[credential as keyof typeof credentials].title}</AccordionTrigger>
                 <AccordionContent>
-                  "{credentials[credential as keyof typeof credentials].excerpt}" <br /><br/>
+                  `{credentials[credential as keyof typeof credentials].excerpt}` <br /><br/>
                   <Link 
                   className="text-bold pt-6" 
                   href={credentials[credential as keyof typeof credentials].link}
diff --git a/components/product/variant-selector.tsx b/components/product/variant-selector.tsx
index aa1c090db..c2e68e5e7 100644
--- a/components/product/variant-selector.tsx
+++ b/components/product/variant-selector.tsx
@@ -26,18 +26,13 @@ export function VariantSelector({
 }: {
   options: ProductOption[];
   variants: ProductVariant[];
-  setSelectedVariant: (newVariant: ProductVariant) => void,
+  setSelectedVariant: (newVariant: OptimizedVariant | undefined) => void,
 }) {
   const pathname = usePathname();
   const currentParams = useSearchParams();
   const router = useRouter();
   const hasNoOptionsOrJustOneOption =
     !options.length || (options.length === 1 && options[0]?.values.length === 1);
-
-  if (hasNoOptionsOrJustOneOption) {
-    return null;
-  }
-
   // Discard any unexpected options or values from url and create params map.
   const paramsMap: ParamsMap = Object.fromEntries(
     Array.from(currentParams.entries()).filter(([key, value]) =>
@@ -87,6 +82,10 @@ export function VariantSelector({
   useEffect(() => {
     setSelectedVariant(selectedVariant);
   }, [selectedVariantUrl]);
+
+  if (hasNoOptionsOrJustOneOption) {
+    return null;
+  }
   
   if (currentUrl !== selectedVariantUrl) {
     router.replace(selectedVariantUrl);