diff --git a/moor_flutter/example/lib/database/database.g.dart b/moor_flutter/example/lib/database/database.g.dart
index ffb1b5e4..01f7478d 100644
--- a/moor_flutter/example/lib/database/database.g.dart
+++ b/moor_flutter/example/lib/database/database.g.dart
@@ -23,7 +23,7 @@ class TodoEntry {
       category: intType.mapFromDatabaseResponse(data['category']),
     );
   }
-  Map<String, Object> toJson() {
+  Map<String, dynamic> toJson() {
     return {
       'id': id,
       'content': content,
@@ -137,7 +137,7 @@ class Category {
       description: stringType.mapFromDatabaseResponse(data['`desc`']),
     );
   }
-  Map<String, Object> toJson() {
+  Map<String, dynamic> toJson() {
     return {
       'id': id,
       'description': description,
diff --git a/moor_generator/lib/src/writer/data_class_writer.dart b/moor_generator/lib/src/writer/data_class_writer.dart
index 462448a0..897c209a 100644
--- a/moor_generator/lib/src/writer/data_class_writer.dart
+++ b/moor_generator/lib/src/writer/data_class_writer.dart
@@ -1,5 +1,5 @@
-import 'package:recase/recase.dart';
 import 'package:moor_generator/src/model/specified_table.dart';
+import 'package:recase/recase.dart';
 
 class DataClassWriter {
   final SpecifiedTable table;
@@ -98,7 +98,7 @@ class DataClassWriter {
   }
 
   void _writeToJson(StringBuffer buffer) {
-    buffer.write('Map<String, Object> toJson() {\n return {');
+    buffer.write('Map<String, dynamic> toJson() {\n return {');
 
     for (var column in table.columns) {
       final getter = column.dartGetterName;