diff --git a/drift_dev/lib/src/writer/tables/table_writer.dart b/drift_dev/lib/src/writer/tables/table_writer.dart
index 92d27f2d..7860e6cf 100644
--- a/drift_dev/lib/src/writer/tables/table_writer.dart
+++ b/drift_dev/lib/src/writer/tables/table_writer.dart
@@ -272,11 +272,11 @@ class TableWriter extends TableOrViewWriter {
   }
 
   void writeDataClass() {
-    if (scope.options.writeToColumnsMixins) {
-      writeToColumnsMixin();
-    }
-
     if (scope.generationOptions.writeDataClasses) {
+      if (scope.options.writeToColumnsMixins) {
+        writeToColumnsMixin();
+      }
+
       final existing = table.existingRowClass;
       if (existing != null) {
         // We don't have to write a row class if we're using one provided by the