diff --git a/src/Illuminate/Collections/Traits/EnumeratesValues.php b/src/Illuminate/Collections/Traits/EnumeratesValues.php
index 0c0c7ce3c3ab..899a1e0ad453 100644
--- a/src/Illuminate/Collections/Traits/EnumeratesValues.php
+++ b/src/Illuminate/Collections/Traits/EnumeratesValues.php
@@ -468,9 +468,9 @@ public function when($value, callable $callback = null, callable $default = null
         }
 
         if ($value) {
-            return $callback($this, $value);
+            return $callback($this, $value) ?: $this;
         } elseif ($default) {
-            return $default($this, $value);
+            return $default($this, $value) ?: $this;
         }
 
         return $this;