diff --git a/lodash.js b/lodash.js
index dbc388320..d7c9ae671 100644
--- a/lodash.js
+++ b/lodash.js
@@ -4715,7 +4715,7 @@
      */
     function curry(func, arity) {
       if (typeof arity != 'number') {
-        arity = +arity || null;
+        arity = +arity || (func ? func.length : 0);
       }
       return createWrapper(func, CURRY_FLAG, arity);
     }