diff --git a/libs/pigment/compositeops/KoCompositeOpFunctions.h b/libs/pigment/compositeops/KoCompositeOpFunctions.h
--- a/libs/pigment/compositeops/KoCompositeOpFunctions.h
+++ b/libs/pigment/compositeops/KoCompositeOpFunctions.h
@@ -177,12 +177,12 @@
 inline T cfColorDodge(T src, T dst) {
     using namespace Arithmetic;
     
-    if(dst == zeroValue<T>())
-        return zeroValue<T>();
+    if(src == unitValue<T>())
+        return unitValue<T>();
     
     T invSrc = inv(src);
     
-    if(invSrc < dst)
+    if(invSrc == zeroValue<T>())
         return unitValue<T>();
     
     return Arithmetic::clamp<T>(div(dst, invSrc));
@@ -344,6 +344,13 @@
     using namespace Arithmetic;
     typedef typename KoColorSpaceMathsTraits<T>::compositetype composite_type;
     
+    if (src == zeroValue<T>()) {
+        return zeroValue<T>();
+    }
+    if (dst == zeroValue<T>()) {
+        return zeroValue<T>();
+    }
+    
     // min(max(2 / (1/dst + 1/src), 0), 1)
     composite_type unit = unitValue<T>();
     composite_type s    = (src != zeroValue<T>()) ? div<T>(unit, src) : unit;