diff --git a/libraries/bxdf/genglsl/open_pbr_surface.mtlx b/libraries/bxdf/genglsl/open_pbr_surface.mtlx
index 85d8717d4e..3a6e3eb627 100644
--- a/libraries/bxdf/genglsl/open_pbr_surface.mtlx
+++ b/libraries/bxdf/genglsl/open_pbr_surface.mtlx
@@ -536,6 +536,7 @@
       <input name="bsdf" type="BSDF" nodename="fuzz_layer" />
       <input name="edf" type="EDF" nodename="emission_edf" />
       <input name="opacity" type="float" interfacename="geometry_opacity" />
+      <input name="thin_walled" type="boolean" interfacename="geometry_thin_walled" />
     </surface>
 
     <!-- Output -->
diff --git a/libraries/bxdf/genmdl/open_pbr_surface.mtlx b/libraries/bxdf/genmdl/open_pbr_surface.mtlx
index d040812085..c6950c5251 100644
--- a/libraries/bxdf/genmdl/open_pbr_surface.mtlx
+++ b/libraries/bxdf/genmdl/open_pbr_surface.mtlx
@@ -533,6 +533,7 @@
       <input name="bsdf" type="BSDF" nodename="fuzz_layer" />
       <input name="edf" type="EDF" nodename="emission_edf" />
       <input name="opacity" type="float" interfacename="geometry_opacity" />
+      <input name="thin_walled" type="boolean" interfacename="geometry_thin_walled" />
     </surface>
 
     <!-- Output -->
diff --git a/libraries/bxdf/open_pbr_surface.mtlx b/libraries/bxdf/open_pbr_surface.mtlx
index 2728d470df..5fd7a2c4af 100644
--- a/libraries/bxdf/open_pbr_surface.mtlx
+++ b/libraries/bxdf/open_pbr_surface.mtlx
@@ -77,7 +77,7 @@
            doc="The color of the emitted light." />
     <input name="geometry_opacity" type="float" value="1" uimin="0" uimax="1" uiname="Opacity" uifolder="Geometry" hint="opacity"
            doc="The opacity of the entire material." />
-    <input name="geometry_thin_walled" type="boolean" value="false" uiname="Thin Walled" uifolder="Geometry" uiadvanced="true"
+    <input name="geometry_thin_walled" type="boolean" value="false" uniform="true" uiname="Thin Walled" uifolder="Geometry" uiadvanced="true"
            doc="If true the surface is double-sided and represents an infinitesimally thin shell. Suitable for extremely geometrically thin objects such as leaves or paper." />
     <input name="geometry_normal" type="vector3" defaultgeomprop="Nworld" uiname="Normal" uifolder="Geometry"
            doc="Input geometric normal" />
@@ -615,6 +615,7 @@
       <input name="bsdf" type="BSDF" nodename="fuzz_layer" />
       <input name="edf" type="EDF" nodename="emission_edf" />
       <input name="opacity" type="float" interfacename="geometry_opacity" />
+      <input name="thin_walled" type="boolean" interfacename="geometry_thin_walled" />
     </surface>
 
     <!-- Output -->