diff --git a/src/main/java/net/minecraftforge/fml/network/FMLHandshakeMessages.java b/src/main/java/net/minecraftforge/fml/network/FMLHandshakeMessages.java
index aed6afeae5..e43317ffde 100644
--- a/src/main/java/net/minecraftforge/fml/network/FMLHandshakeMessages.java
+++ b/src/main/java/net/minecraftforge/fml/network/FMLHandshakeMessages.java
@@ -62,7 +62,7 @@ public class FMLHandshakeMessages
         {
             this.mods = ModList.get().getMods().stream().map(ModInfo::getModId).collect(Collectors.toList());
             this.channels = NetworkRegistry.buildChannelVersions();
-            this.registries = RegistryManager.registryNames();
+            this.registries = RegistryManager.getRegistryNamesForSyncToClient();
         }
 
         private S2CModList(List<String> mods, Map<ResourceLocation, String> channels, List<ResourceLocation> registries)
diff --git a/src/main/java/net/minecraftforge/registries/RegistryManager.java b/src/main/java/net/minecraftforge/registries/RegistryManager.java
index a03017e6f5..118b81db9d 100644
--- a/src/main/java/net/minecraftforge/registries/RegistryManager.java
+++ b/src/main/java/net/minecraftforge/registries/RegistryManager.java
@@ -190,8 +190,10 @@ public class RegistryManager
                 collect(Collectors.toList()) : Collections.emptyList();
     }
 
-    public static List<ResourceLocation> registryNames()
+    public static List<ResourceLocation> getRegistryNamesForSyncToClient()
     {
-        return new ArrayList<>(ACTIVE.registries.keySet());
+        return ACTIVE.registries.keySet().stream().
+                filter(resloc -> ACTIVE.synced.contains(resloc)).
+                collect(Collectors.toList());
     }
 }