diff --git a/src/Shader/SamplerCore.cpp b/src/Shader/SamplerCore.cpp
index 8a2aa39..72bc9f4 100644
--- a/src/Shader/SamplerCore.cpp
+++ b/src/Shader/SamplerCore.cpp
@@ -2380,14 +2380,16 @@
 				case ADDRESSING_CLAMP:
 				case ADDRESSING_BORDER:
 				case ADDRESSING_SEAMLESS:
-					// Linear filtering of cube doesn't require clamping because the coordinates
-					// are already in [0, 1] range and numerical imprecision is tolerated.
-					if(addressingMode != ADDRESSING_SEAMLESS || pointFilter)
-					{
-						Float4 one = As<Float4>(Int4(oneBits));
-						coord = Min(Max(coord, Float4(0.0f)), one);
-					}
-					break;
+				{
+					// While cube face coordinates are nominally already in the
+					// [0, 1] range due to the projection, and numerical
+					// imprecision is tolerated due to the border of pixels for
+					// seamless filtering, this isn't true for inf and NaN
+					// values. So we always clamp.
+					Float4 one = As<Float4>(Int4(oneBits));
+					coord = Min(Max(coord, Float4(0.0f)), one);
+				}
+				break;
 				case ADDRESSING_MIRROR:
 				{
 					Float4 half = As<Float4>(Int4(halfBits));