diff --git a/src/main/java/li/cil/oc2/data/DataGenerators.java b/src/main/java/li/cil/oc2/data/DataGenerators.java
index 81337d28..3d7a618c 100644
--- a/src/main/java/li/cil/oc2/data/DataGenerators.java
+++ b/src/main/java/li/cil/oc2/data/DataGenerators.java
@@ -12,16 +12,18 @@ public final class DataGenerators {
     @SubscribeEvent
     public static void gatherData(final GatherDataEvent event) {
         final DataGenerator generator = event.getGenerator();
+        final ExistingFileHelper existingFileHelper = event.getExistingFileHelper();
 
-        if (event.includeClient()) {
-            final ExistingFileHelper existingFileHelper = event.getExistingFileHelper();
-            generator.addProvider(new ModBlockStateProvider(generator, existingFileHelper));
-            generator.addProvider(new ModItemModelProvider(generator, existingFileHelper));
+        if (event.includeServer()) {
             generator.addProvider(new ModLootTableProvider(generator));
             final BlockTagsProvider blockTagProvider = new ModBlockTagsProvider(generator, existingFileHelper);
             generator.addProvider(blockTagProvider);
             generator.addProvider(new ModItemTagsProvider(generator, blockTagProvider, existingFileHelper));
             generator.addProvider(new ModRecipesProvider(generator));
         }
+        if (event.includeClient()) {
+            generator.addProvider(new ModBlockStateProvider(generator, existingFileHelper));
+            generator.addProvider(new ModItemModelProvider(generator, existingFileHelper));
+        }
     }
 }