diff --git a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
index 345974e95c..3faf8d4a4f 100644
--- a/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
+++ b/libraries/stdlib/genosl/stdlib_genosl_impl.mtlx
@@ -387,26 +387,26 @@
   <implementation name="IM_sin_float_genosl" nodedef="ND_sin_float" target="genosl" sourcecode="sin({{in}})" />
   <implementation name="IM_cos_float_genosl" nodedef="ND_cos_float" target="genosl" sourcecode="cos({{in}})" />
   <implementation name="IM_tan_float_genosl" nodedef="ND_tan_float" target="genosl" sourcecode="tan({{in}})" />
-  <implementation name="IM_asin_float_genosl" nodedef="ND_asin_float" target="genosl" sourcecode="asin({{in}})" />
-  <implementation name="IM_acos_float_genosl" nodedef="ND_acos_float" target="genosl" sourcecode="acos({{in}})" />
+  <implementation name="IM_asin_float_genosl" nodedef="ND_asin_float" target="genosl" sourcecode="mx_ternary(abs({{in}}) <= 1.0, asin({{in}}), 0.0)" />
+  <implementation name="IM_acos_float_genosl" nodedef="ND_acos_float" target="genosl" sourcecode="mx_ternary(abs({{in}}) <= 1.0, acos({{in}}), 0.0)" />
   <implementation name="IM_atan2_float_genosl" nodedef="ND_atan2_float" target="genosl" sourcecode="atan2({{iny}},{{inx}})" />
   <implementation name="IM_sin_vector2_genosl" nodedef="ND_sin_vector2" target="genosl" sourcecode="sin({{in}})" />
   <implementation name="IM_cos_vector2_genosl" nodedef="ND_cos_vector2" target="genosl" sourcecode="cos({{in}})" />
   <implementation name="IM_tan_vector2_genosl" nodedef="ND_tan_vector2" target="genosl" sourcecode="tan({{in}})" />
-  <implementation name="IM_asin_vector2_genosl" nodedef="ND_asin_vector2" target="genosl" sourcecode="asin({{in}})" />
-  <implementation name="IM_acos_vector2_genosl" nodedef="ND_acos_vector2" target="genosl" sourcecode="acos({{in}})" />
+  <implementation name="IM_asin_vector2_genosl" nodedef="ND_asin_vector2" target="genosl" sourcecode="vector2(mx_ternary(abs({{in}}.x) &lt;= 1.0, asin({{in}}.x), 0.0), mx_ternary(abs({{in}}.y) &lt;= 1.0, asin({{in}}.y), 0.0))" />
+  <implementation name="IM_acos_vector2_genosl" nodedef="ND_acos_vector2" target="genosl" sourcecode="vector2(mx_ternary(abs({{in}}.x) &lt;= 1.0, acos({{in}}.x), 0.0), mx_ternary(abs({{in}}.y) &lt;= 1.0, acos({{in}}.y), 0.0))" />
   <implementation name="IM_atan2_vector2_genosl" nodedef="ND_atan2_vector2" target="genosl" sourcecode="atan2({{iny}},{{inx}})" />
   <implementation name="IM_sin_vector3_genosl" nodedef="ND_sin_vector3" target="genosl" sourcecode="sin({{in}})" />
   <implementation name="IM_cos_vector3_genosl" nodedef="ND_cos_vector3" target="genosl" sourcecode="cos({{in}})" />
   <implementation name="IM_tan_vector3_genosl" nodedef="ND_tan_vector3" target="genosl" sourcecode="tan({{in}})" />
-  <implementation name="IM_asin_vector3_genosl" nodedef="ND_asin_vector3" target="genosl" sourcecode="asin({{in}})" />
-  <implementation name="IM_acos_vector3_genosl" nodedef="ND_acos_vector3" target="genosl" sourcecode="acos({{in}})" />
+  <implementation name="IM_asin_vector3_genosl" nodedef="ND_asin_vector3" target="genosl" sourcecode="vector(mx_ternary(abs({{in}}.x) &lt;= 1.0, asin({{in}}.x), 0.0), mx_ternary(abs({{in}}.y) &lt;= 1.0, asin({{in}}.y), 0.0), mx_ternary(abs({{in}}.z) &lt;= 1.0, asin({{in}}.z), 0.0))" />
+  <implementation name="IM_acos_vector3_genosl" nodedef="ND_acos_vector3" target="genosl" sourcecode="vector(mx_ternary(abs({{in}}.x) &lt;= 1.0, acos({{in}}.x), 0.0), mx_ternary(abs({{in}}.y) &lt;= 1.0, acos({{in}}.y), 0.0), mx_ternary(abs({{in}}.z) &lt;= 1.0, acos({{in}}.z), 0.0))" />
   <implementation name="IM_atan2_vector3_genosl" nodedef="ND_atan2_vector3" target="genosl" sourcecode="atan2({{iny}},{{inx}})" />
   <implementation name="IM_sin_vector4_genosl" nodedef="ND_sin_vector4" target="genosl" sourcecode="sin({{in}})" />
   <implementation name="IM_cos_vector4_genosl" nodedef="ND_cos_vector4" target="genosl" sourcecode="cos({{in}})" />
   <implementation name="IM_tan_vector4_genosl" nodedef="ND_tan_vector4" target="genosl" sourcecode="tan({{in}})" />
-  <implementation name="IM_asin_vector4_genosl" nodedef="ND_asin_vector4" target="genosl" sourcecode="asin({{in}})" />
-  <implementation name="IM_acos_vector4_genosl" nodedef="ND_acos_vector4" target="genosl" sourcecode="acos({{in}})" />
+  <implementation name="IM_asin_vector4_genosl" nodedef="ND_asin_vector4" target="genosl" sourcecode="vector4(mx_ternary(abs({{in}}.x) &lt;= 1.0, asin({{in}}.x), 0.0), mx_ternary(abs({{in}}.y) &lt;= 1.0, asin({{in}}.y), 0.0), mx_ternary(abs({{in}}.z) &lt;= 1.0, asin({{in}}.z), 0.0), mx_ternary(abs({{in}}.w) &lt;= 1.0, asin({{in}}.w), 0.0))" />
+  <implementation name="IM_acos_vector4_genosl" nodedef="ND_acos_vector4" target="genosl" sourcecode="vector4(mx_ternary(abs({{in}}.x) &lt;= 1.0, acos({{in}}.x), 0.0), mx_ternary(abs({{in}}.y) &lt;= 1.0, acos({{in}}.y), 0.0), mx_ternary(abs({{in}}.z) &lt;= 1.0, acos({{in}}.z), 0.0), mx_ternary(abs({{in}}.w) &lt;= 1.0, acos({{in}}.w), 0.0))" />
   <implementation name="IM_atan2_vector4_genosl" nodedef="ND_atan2_vector4" target="genosl" sourcecode="atan2({{iny}},{{inx}})" />
 
   <!-- <sqrt> -->