diff --git a/lib/buffer.js b/lib/buffer.js
index 4c98c0cdb52ef0..6eba7502664888 100644
--- a/lib/buffer.js
+++ b/lib/buffer.js
@@ -148,8 +148,6 @@ Buffer.alloc = function(size, fill, encoding) {
 Buffer.allocUnsafe = function(size) {
   if (typeof size !== 'number')
     throw new TypeError('"size" argument must be a number');
-  if (size > 0)
-    flags[kNoZeroFill] = 1;
   return allocate(size);
 };
 
diff --git a/test/parallel/test-buffer-safe-unsafe.js b/test/parallel/test-buffer-safe-unsafe.js
index 6646f760564432..9f8b6b7410b8fb 100644
--- a/test/parallel/test-buffer-safe-unsafe.js
+++ b/test/parallel/test-buffer-safe-unsafe.js
@@ -7,8 +7,18 @@ const safe = Buffer.alloc(10);
 
 function isZeroFilled(buf) {
   for (let n = 0; n < buf.length; n++)
-    if (buf[n] > 0) return false;
+    if (buf[n] !== 0) return false;
   return true;
 }
 
 assert(isZeroFilled(safe));
+
+// Test that unsafe allocations doesn't affect subsequent safe allocations
+Buffer.allocUnsafe(10);
+assert(isZeroFilled(new Float64Array(10)));
+
+new Buffer(10);
+assert(isZeroFilled(new Float64Array(10)));
+
+Buffer.allocUnsafe(10);
+assert(isZeroFilled(Buffer.alloc(10)));