diff --git a/libraries/model/src/model/Light.slh b/libraries/model/src/model/Light.slh
index 7cc4691d63..7cb745ff53 100644
--- a/libraries/model/src/model/Light.slh
+++ b/libraries/model/src/model/Light.slh
@@ -98,10 +98,18 @@ float getLightShowContour(Light l) {
     return l._control.w;
 }
 
+// Light is the light source its self, d is the light's distance calculated as length(unnormalized light vector).
 float evalLightAttenuation(Light l, float d) {
     float radius = getLightRadius(l);
     float denom = d / radius + 1.0;
-    float attenuation = min(1.0, 1.0 / (denom * denom));
+    float attenuation = 1.0 / (denom * denom);
+    
+    float cutoff = getLightCutoffRadius(l);
+    
+    // "Fade" the edges of light sources to make things look a bit more attractive.
+    // Note: this tends to look a bit odd at lower exponents.
+    attenuation *= min(1, max(0, -(d - cutoff)));
+    
     return attenuation;
 }
 
diff --git a/libraries/render-utils/src/point_light.slf b/libraries/render-utils/src/point_light.slf
index fc72f094e7..8c9ff2c8ad 100644
--- a/libraries/render-utils/src/point_light.slf
+++ b/libraries/render-utils/src/point_light.slf
@@ -66,7 +66,7 @@ void main(void) {
     vec3 fragEyeDir = normalize(fragEyeVector.xyz);
     vec4 shading = evalFragShading(fragNormal, fragLightDir, fragEyeDir, frag.metallic, frag.specular, frag.roughness);
 
-    // Eval attenuation
+    // Eval attenuation  
     float radialAttenuation = evalLightAttenuation(light, fragLightDistance);
 
     // Final Lighting color