diff --git a/dist/lodash.compat.js b/dist/lodash.compat.js
index 129d47f51..4e8c43029 100644
--- a/dist/lodash.compat.js
+++ b/dist/lodash.compat.js
@@ -6511,17 +6511,18 @@
           noMax = max == null;
 
       if (floating == null) {
-        if (typeof min == 'boolean' && noMax) {
+        if (noMax && typeof min == 'boolean') {
           floating = min;
           min = 1;
         }
-        else if (!noMax && typeof max == 'boolean') {
+        else if (typeof max == 'boolean') {
           floating = max;
           noMax = true;
         }
       }
       if (noMin && noMax) {
         max = 1;
+        noMax = false;
       }
       min = +min || 0;
       if (noMax) {
diff --git a/dist/lodash.compat.min.js b/dist/lodash.compat.min.js
index ed011aa03..23bde1d48 100644
--- a/dist/lodash.compat.min.js
+++ b/dist/lodash.compat.min.js
@@ -50,7 +50,7 @@ i in n&&(e[i]=n[i])}else t=v.createCallback(t,r,3),ne(n,function(n,r,u){t(n,r,u)
 },v.cloneDeep=function(n,t,r){return tt(n,true,typeof t=="function"&&ut(t,r,1))},v.contains=Pt,v.escape=function(n){return null==n?"":vr(n).replace(R,mt)},v.every=Dt,v.find=qt,v.findIndex=function(n,t,r){var e=-1,u=n?n.length:0;for(t=v.createCallback(t,r,3);++e<u;)if(t(n[e],e,n))return e;return-1},v.findKey=function(n,t,r){var e;return t=v.createCallback(t,r,3),kt(n,function(n,r,u){return t(n,r,u)?(e=r,false):void 0}),e},v.findLast=function(n,t,r){var e;return t=v.createCallback(t,r,3),Bt(n,function(n,r,u){return t(n,r,u)?(e=n,false):void 0
 }),e},v.findLastIndex=function(n,t,r){var e=n?n.length:0;for(t=v.createCallback(t,r,3);e--;)if(t(n[e],e,n))return e;return-1},v.findLastKey=function(n,t,r){var e;return t=v.createCallback(t,r,3),Ot(n,function(n,r,u){return t(n,r,u)?(e=r,false):void 0}),e},v.has=function(n,t){return n?Ar.call(n,t):false},v.identity=tr,v.indexOf=Gt,v.isArguments=jt,v.isArray=Xr,v.isBoolean=function(n){return true===n||false===n||n&&typeof n=="object"&&xr.call(n)==W||false},v.isDate=function(n){return n&&typeof n=="object"&&xr.call(n)==z||false
 },v.isElement=St,v.isEmpty=function(n){var t=true;if(!n)return t;var r=xr.call(n),e=n.length;return r==L||r==H||(Jr.argsClass?r==B:jt(n))||r==U&&typeof e=="number"&&It(n.splice)?!e:(kt(n,function(){return t=false}),t)},v.isEqual=function(n,t,r,e){return ct(n,t,typeof r=="function"&&ut(r,e,2))},v.isFinite=function(n){return Lr(n)&&!Wr(parseFloat(n))},v.isFunction=It,v.isNaN=function(n){return Nt(n)&&n!=+n},v.isNull=function(n){return null===n},v.isNumber=Nt,v.isObject=At,v.isPlainObject=te,v.isRegExp=function(n){return n&&nt[typeof n]&&xr.call(n)==G||false
-},v.isString=Rt,v.isUndefined=function(n){return typeof n=="undefined"},v.lastIndexOf=function(n,t,r){var e=n?n.length:0;for(typeof r=="number"&&(e=(0>r?Kr(0,e+r):Mr(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},v.mixin=er,v.noConflict=function(){return r._=jr,this},v.noop=ur,v.now=ae,v.parseInt=ie,v.random=function(n,t,r){var e=null==n,u=null==t;return null==r&&(typeof n=="boolean"&&u?(r=n,n=1):u||typeof t!="boolean"||(r=t,u=true)),e&&u&&(t=1),n=+n||0,u?(t=n,n=0):t=+t||0,r||n%1||t%1?(r=Ur(),Mr(n+r*(t-n+parseFloat("1e-"+((r+"").length-1))),t)):st(n,t)
+},v.isString=Rt,v.isUndefined=function(n){return typeof n=="undefined"},v.lastIndexOf=function(n,t,r){var e=n?n.length:0;for(typeof r=="number"&&(e=(0>r?Kr(0,e+r):Mr(r,e-1))+1);e--;)if(n[e]===t)return e;return-1},v.mixin=er,v.noConflict=function(){return r._=jr,this},v.noop=ur,v.now=ae,v.parseInt=ie,v.random=function(n,t,r){var e=null==n,u=null==t;return null==r&&(u&&typeof n=="boolean"?(r=n,n=1):typeof t=="boolean"&&(r=t,u=true)),e&&u&&(t=1,u=false),n=+n||0,u?(t=n,n=0):t=+t||0,r||n%1||t%1?(r=Ur(),Mr(n+r*(t-n+parseFloat("1e-"+((r+"").length-1))),t)):st(n,t)
 },v.reduce=zt,v.reduceRight=Kt,v.result=function(n,t){if(n){var r=n[t];return It(r)?n[t]():r}},v.runInContext=g,v.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:Zr(n).length},v.some=Vt,v.sortedIndex=Jt,v.template=function(n,t,r){var e=v.templateSettings;n=vr(n||""),r=Ct({},r,e);var u,o=Ct({},r.imports,e.imports),e=Zr(o),o=Tt(o),i=0,f=r.interpolate||P,l="__p+='",f=hr((r.escape||P).source+"|"+f.source+"|"+(f===A?k:P).source+"|"+(r.evaluate||P).source+"|$","g");n.replace(f,function(t,r,e,o,f,c){return e||(e=o),l+=n.slice(i,c).replace($,a),r&&(l+="'+__e("+r+")+'"),f&&(u=true,l+="';"+f+";\n__p+='"),e&&(l+="'+((__t=("+e+"))==null?'':__t)+'"),i=c+t.length,t
 }),l+="';",f=r=r.variable,f||(r="obj",l="with("+r+"){"+l+"}"),l=(u?l.replace(j,""):l).replace(x,"$1").replace(C,"$1;"),l="function("+r+"){"+(f?"":r+"||("+r+"={});")+"var __t,__p='',__e=_.escape"+(u?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+l+"return __p}";try{var c=cr(e,"return "+l).apply(h,o)}catch(p){throw p.source=l,p}return t?c(t):(c.source=l,c)},v.unescape=function(n){return null==n?"":(n=vr(n),0>n.indexOf(";")?n:n.replace(N,wt))},v.uniqueId=function(n){var t=++m;
 return vr(null==n?"":n)+t},v.all=Dt,v.any=Vt,v.detect=qt,v.findWhere=qt,v.foldl=zt,v.foldr=Kt,v.include=Pt,v.inject=zt,er(function(){var n={};return kt(v,function(t,r){v.prototype[r]||(n[r]=t)}),n}(),false),v.first=Ut,v.last=function(n,t,r){var e=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=u;for(t=v.createCallback(t,r,3);o--&&t(n[o],o,n);)e++}else if(e=t,null==e||r)return n?n[u-1]:h;return s(n,Kr(0,u-e))},v.sample=function(n,t,r){return n&&typeof n.length!="number"?n=Tt(n):Jr.unindexedChars&&Rt(n)&&(n=n.split("")),null==t||r?n?n[st(0,n.length-1)]:h:(n=Mt(n),n.length=Mr(Kr(0,t),n.length),n)
diff --git a/dist/lodash.js b/dist/lodash.js
index e1e0b0026..4dbaaab86 100644
--- a/dist/lodash.js
+++ b/dist/lodash.js
@@ -6192,17 +6192,18 @@
           noMax = max == null;
 
       if (floating == null) {
-        if (typeof min == 'boolean' && noMax) {
+        if (noMax && typeof min == 'boolean') {
           floating = min;
           min = 1;
         }
-        else if (!noMax && typeof max == 'boolean') {
+        else if (typeof max == 'boolean') {
           floating = max;
           noMax = true;
         }
       }
       if (noMin && noMax) {
         max = 1;
+        noMax = false;
       }
       min = +min || 0;
       if (noMax) {
diff --git a/dist/lodash.min.js b/dist/lodash.min.js
index 24e9bbf99..83a9d81ff 100644
--- a/dist/lodash.min.js
+++ b/dist/lodash.min.js
@@ -46,7 +46,7 @@ if(typeof t!="number"&&null!=t){var o=u;for(t=d.createCallback(t,e,3);o--&&t(n[o
 },d.cloneDeep=function(n,t,e){return tt(n,true,typeof t=="function"&&ut(t,e,1))},d.contains=St,d.escape=function(n){return null==n?"":se(n).replace(S,vt)},d.every=Tt,d.find=Dt,d.findIndex=function(n,t,e){var r=-1,u=n?n.length:0;for(t=d.createCallback(t,e,3);++r<u;)if(t(n[r],r,n))return r;return-1},d.findKey=function(n,t,e){var r;return t=d.createCallback(t,e,3),jt(n,function(n,e,u){return t(n,e,u)?(r=e,false):void 0}),r},d.findLast=function(n,t,e){var r;return t=d.createCallback(t,e,3),Ft(n,function(n,e,u){return t(n,e,u)?(r=n,false):void 0
 }),r},d.findLastIndex=function(n,t,e){var r=n?n.length:0;for(t=d.createCallback(t,e,3);r--;)if(t(n[r],r,n))return r;return-1},d.findLastKey=function(n,t,e){var r;return t=d.createCallback(t,e,3),kt(n,function(n,e,u){return t(n,e,u)?(r=e,false):void 0}),r},d.has=function(n,t){return n?Oe.call(n,t):false},d.identity=Yt,d.indexOf=Mt,d.isArguments=dt,d.isArray=Ue,d.isBoolean=function(n){return true===n||false===n||n&&typeof n=="object"&&de.call(n)==W||false},d.isDate=function(n){return n&&typeof n=="object"&&de.call(n)==z||false
 },d.isElement=Ct,d.isEmpty=function(n){var t=true;if(!n)return t;var e=de.call(n),r=n.length;return e==q||e==V||e==B||e==L&&typeof r=="number"&&Ot(n.splice)?!r:(jt(n,function(){return t=false}),t)},d.isEqual=function(n,t,e,r){return ft(n,t,typeof e=="function"&&ut(e,r,2))},d.isFinite=function(n){return $e(n)&&!Fe(parseFloat(n))},d.isFunction=Ot,d.isNaN=function(n){return Nt(n)&&n!=+n},d.isNull=function(n){return null===n},d.isNumber=Nt,d.isObject=Et,d.isPlainObject=He,d.isRegExp=function(n){return n&&typeof n=="object"&&de.call(n)==M||false
-},d.isString=It,d.isUndefined=function(n){return typeof n=="undefined"},d.lastIndexOf=function(n,t,e){var r=n?n.length:0;for(typeof e=="number"&&(r=(0>e?qe(0,r+e):We(e,r-1))+1);r--;)if(n[r]===t)return r;return-1},d.mixin=ne,d.noConflict=function(){return e._=be,this},d.noop=te,d.now=Ze,d.parseInt=nr,d.random=function(n,t,e){var r=null==n,u=null==t;return null==e&&(typeof n=="boolean"&&u?(e=n,n=1):u||typeof t!="boolean"||(e=t,u=true)),r&&u&&(t=1),n=+n||0,u?(t=n,n=0):t=+t||0,e||n%1||t%1?(e=Pe(),We(n+e*(t-n+parseFloat("1e-"+((e+"").length-1))),t)):ct(n,t)
+},d.isString=It,d.isUndefined=function(n){return typeof n=="undefined"},d.lastIndexOf=function(n,t,e){var r=n?n.length:0;for(typeof e=="number"&&(r=(0>e?qe(0,r+e):We(e,r-1))+1);r--;)if(n[r]===t)return r;return-1},d.mixin=ne,d.noConflict=function(){return e._=be,this},d.noop=te,d.now=Ze,d.parseInt=nr,d.random=function(n,t,e){var r=null==n,u=null==t;return null==e&&(u&&typeof n=="boolean"?(e=n,n=1):typeof t=="boolean"&&(e=t,u=true)),r&&u&&(t=1,u=false),n=+n||0,u?(t=n,n=0):t=+t||0,e||n%1||t%1?(e=Pe(),We(n+e*(t-n+parseFloat("1e-"+((e+"").length-1))),t)):ct(n,t)
 },d.reduce=Wt,d.reduceRight=zt,d.result=function(n,t){if(n){var e=n[t];return Ot(e)?n[t]():e}},d.runInContext=s,d.size=function(n){var t=n?n.length:0;return typeof t=="number"?t:Ge(n).length},d.some=Kt,d.sortedIndex=Ut,d.template=function(n,t,e){var r=d.templateSettings;n=se(n||""),e=wt({},e,r);var u,o=wt({},e.imports,r.imports),r=Ge(o),o=Rt(o),a=0,f=e.interpolate||A,l="__p+='",f=pe((e.escape||A).source+"|"+f.source+"|"+(f===I?x:A).source+"|"+(e.evaluate||A).source+"|$","g");n.replace(f,function(t,e,r,o,f,c){return r||(r=o),l+=n.slice(a,c).replace($,i),e&&(l+="'+__e("+e+")+'"),f&&(u=true,l+="';"+f+";\n__p+='"),r&&(l+="'+((__t=("+r+"))==null?'':__t)+'"),a=c+t.length,t
 }),l+="';",f=e=e.variable,f||(e="obj",l="with("+e+"){"+l+"}"),l=(u?l.replace(w,""):l).replace(j,"$1").replace(k,"$1;"),l="function("+e+"){"+(f?"":e+"||("+e+"={});")+"var __t,__p='',__e=_.escape"+(u?",__j=Array.prototype.join;function print(){__p+=__j.call(arguments,'')}":";")+l+"return __p}";try{var c=ae(r,"return "+l).apply(h,o)}catch(p){throw p.source=l,p}return t?c(t):(c.source=l,c)},d.unescape=function(n){return null==n?"":(n=se(n),0>n.indexOf(";")?n:n.replace(R,bt))},d.uniqueId=function(n){var t=++y;
 return se(null==n?"":n)+t},d.all=Tt,d.any=Kt,d.detect=Dt,d.findWhere=Dt,d.foldl=Wt,d.foldr=zt,d.include=St,d.inject=Wt,ne(function(){var n={};return jt(d,function(t,e){d.prototype[e]||(n[e]=t)}),n}(),false),d.first=Lt,d.last=function(n,t,e){var r=0,u=n?n.length:0;if(typeof t!="number"&&null!=t){var o=u;for(t=d.createCallback(t,e,3);o--&&t(n[o],o,n);)r++}else if(r=t,null==r||e)return n?n[u-1]:h;return p(n,qe(0,u-r))},d.sample=function(n,t,e){return n&&typeof n.length!="number"&&(n=Rt(n)),null==t||e?n?n[ct(0,n.length-1)]:h:(n=Pt(n),n.length=We(qe(0,t),n.length),n)
diff --git a/lodash.js b/lodash.js
index f893ccf3f..cc1782ef7 100644
--- a/lodash.js
+++ b/lodash.js
@@ -6528,17 +6528,18 @@
           noMax = max == null;
 
       if (floating == null) {
-        if (typeof min == 'boolean' && noMax) {
+        if (noMax && typeof min == 'boolean') {
           floating = min;
           min = 1;
         }
-        else if (!noMax && typeof max == 'boolean') {
+        else if (typeof max == 'boolean') {
           floating = max;
           noMax = true;
         }
       }
       if (noMin && noMax) {
         max = 1;
+        noMax = false;
       }
       min = +min || 0;
       if (noMax) {
diff --git a/test/test.js b/test/test.js
index 116b4afae..e7157da67 100644
--- a/test/test.js
+++ b/test/test.js
@@ -6046,12 +6046,14 @@
     var array = Array(1000);
 
     test('should return `0` or `1` when arguments are not provided', 1, function() {
-      var actual = _.random();
-      ok(actual === 0 || actual === 1);
+      var actual = _.map(array, function() {
+        return _.random();
+      });
+
+      deepEqual(_.uniq(actual).sort(), [0, 1]);
     });
 
     test('supports not passing a `max` argument', 1, function() {
-      var actual = _.random(5);
       ok(_.some(array, function() {
         return _.random(5) != 5;
       }));