diff --git a/dart/example/example.dart b/dart/example/example.dart
index c84ffa601..ec26c1a23 100644
--- a/dart/example/example.dart
+++ b/dart/example/example.dart
@@ -75,8 +75,8 @@ void builderTest() {
     ..addColor(myGame.Color.Red);
 
   final int monsteroff = monster.finish();
-  final buffer = builder.finish(monsteroff);
-  if (verify(buffer)) {
+  builder.finish(monsteroff);
+  if (verify(builder.buffer)) {
     print(
         "The FlatBuffer was successfully created with a builder and verified!");
   }
diff --git a/dart/example/monster_my_game.sample_generated.dart b/dart/example/monster_my_game.sample_generated.dart
index 4f08860fb..f5ab93cae 100644
--- a/dart/example/monster_my_game.sample_generated.dart
+++ b/dart/example/monster_my_game.sample_generated.dart
@@ -168,7 +168,8 @@ class Vec3ObjectBuilder extends fb.ObjectBuilder {
   Uint8List toBytes([String? fileIdentifier]) {
     fb.Builder fbBuilder = new fb.Builder();
     int offset = finish(fbBuilder);
-    return fbBuilder.finish(offset, fileIdentifier);
+    fbBuilder.finish(offset, fileIdentifier);
+    return fbBuilder.buffer;
   }
 }
 class Monster {
@@ -307,16 +308,13 @@ class MonsterObjectBuilder extends fb.ObjectBuilder {
   @override
   int finish(fb.Builder fbBuilder) {
     final int? nameOffset = fbBuilder.writeString(_name);
-    final int? inventoryOffset = _inventory?.isNotEmpty == true
-        ? fbBuilder.writeListUint8(_inventory!)
-        : null;
-    final int? weaponsOffset = _weapons?.isNotEmpty == true
-        ? fbBuilder.writeList(_weapons!.map((b) => b.getOrCreateOffset(fbBuilder)).toList())
-        : null;
+    final int? inventoryOffset = _inventory == null ? null
+        : fbBuilder.writeListUint8(_inventory!);
+    final int? weaponsOffset = _weapons == null ? null
+        : fbBuilder.writeList(_weapons!.map((b) => b.getOrCreateOffset(fbBuilder)).toList());
     final int? equippedOffset = _equipped?.getOrCreateOffset(fbBuilder);
-    final int? pathOffset = _path?.isNotEmpty == true
-        ? fbBuilder.writeListOfStructs(_path!)
-        : null;
+    final int? pathOffset = _path == null ? null
+        : fbBuilder.writeListOfStructs(_path!);
     fbBuilder.startTable();
     if (_pos != null) {
       fbBuilder.addStruct(0, _pos!.finish(fbBuilder));
@@ -338,7 +336,8 @@ class MonsterObjectBuilder extends fb.ObjectBuilder {
   Uint8List toBytes([String? fileIdentifier]) {
     fb.Builder fbBuilder = new fb.Builder();
     int offset = finish(fbBuilder);
-    return fbBuilder.finish(offset, fileIdentifier);
+    fbBuilder.finish(offset, fileIdentifier);
+    return fbBuilder.buffer;
   }
 }
 class Weapon {
@@ -419,6 +418,7 @@ class WeaponObjectBuilder extends fb.ObjectBuilder {
   Uint8List toBytes([String? fileIdentifier]) {
     fb.Builder fbBuilder = new fb.Builder();
     int offset = finish(fbBuilder);
-    return fbBuilder.finish(offset, fileIdentifier);
+    fbBuilder.finish(offset, fileIdentifier);
+    return fbBuilder.buffer;
   }
 }
diff --git a/samples/dart_sample.sh b/samples/dart_sample.sh
index bc4328ede..735d3fc5f 100755
--- a/samples/dart_sample.sh
+++ b/samples/dart_sample.sh
@@ -47,7 +47,4 @@ echo Running the Dart sample.
 # Execute the sample.
 dart example.dart
 
-# Cleanup temporary files.
-git checkout monster_my_game.sample_generated.dart
-
 cd ../../samples