diff --git a/lib/src/utils.dart b/lib/src/utils.dart
index 7fbf68be067626204f269cef1a893df175eb2560..b37b32fcfcdd767c26f43f424ecdba4375af88dd 100644
--- a/lib/src/utils.dart
+++ b/lib/src/utils.dart
@@ -82,9 +82,7 @@ class BlockStream extends StreamTransformerBase<List<int>, List<int>> {
       }
     }
 
-    if (buffer.length != 0) {
-      yield buffer.toBytes();
-    }
+    yield buffer.toBytes();
   }
 }
 
diff --git a/test/minio_dart_test.dart b/test/minio_dart_test.dart
index b980301672d01382386a61236d859f2f0035749e..cec078472299b67ff4bc0bcdc6718ade8f4db37f 100644
--- a/test/minio_dart_test.dart
+++ b/test/minio_dart_test.dart
@@ -155,6 +155,18 @@ void main() {
       expect(stat.metaData[userDefinedMetadataKey],
           equals(userDefinedMetadataValue));
     });
+
+    test('fPutObject() with empty file', () async {
+      final objectName = 'empty.txt';
+      final emptyFile = await File('${tempDir.path}/$objectName').create();
+      await emptyFile.writeAsString('');
+
+      final minio = _getClient();
+      await minio.fPutObject(bucketName, objectName, emptyFile.path);
+
+      final stat = await minio.statObject(bucketName, objectName);
+      expect(stat.size, equals(0));
+    });
   });
 }