diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/kernel/services/gson/GsonEventSerializer.java b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/kernel/services/gson/GsonEventSerializer.java
index e5f0807fa2..48e3bddbc4 100644
--- a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/kernel/services/gson/GsonEventSerializer.java
+++ b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/kernel/services/gson/GsonEventSerializer.java
@@ -54,6 +54,7 @@
 
 /**
  * Serialize the {@link EventDispatch} content using GSON to generate the corresponding {@link EventEnvelope}.
+ * Caution: the Gson serializer is not able to serialize lambda expressions.
  *
  * <p>This implementation assumes that an {@link EventEncrypter} and {@link Gson} are injected.
  *
diff --git a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/modules/eventserial/NetworkEventModule.java b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/modules/eventserial/NetworkEventModule.java
index a5c1736e62..191a8573fc 100644
--- a/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/modules/eventserial/NetworkEventModule.java
+++ b/sre/io.janusproject/io.janusproject.plugin/src/io/janusproject/modules/eventserial/NetworkEventModule.java
@@ -33,6 +33,7 @@
 import io.janusproject.JanusConfig;
 import io.janusproject.kernel.services.gson.GsonEventSerializer;
 import io.janusproject.kernel.services.jdk.network.AESEventEncrypter;
+import io.janusproject.kernel.services.jdk.network.JavaBinaryEventSerializer;
 import io.janusproject.kernel.services.jdk.network.PlainTextEventEncrypter;
 import io.janusproject.services.network.EventEncrypter;
 import io.janusproject.services.network.EventSerializer;
@@ -49,7 +50,7 @@
  */
 public class NetworkEventModule extends AbstractModule {
 
-	private static final Class<? extends EventSerializer> DEFAULT_EVENT_SERIALIZER = GsonEventSerializer.class;
+	private static final Class<? extends EventSerializer> DEFAULT_EVENT_SERIALIZER = JavaBinaryEventSerializer.class;
 
 	private static final Class<? extends EventEncrypter> DEFAULT_EVENT_ENCRYPTER = PlainTextEventEncrypter.class;
 
diff --git a/sre/io.janusproject/io.janusproject.tests/src/test/java/io/janusproject/tests/services/network/NetworkConfigTest.java b/sre/io.janusproject/io.janusproject.tests/src/test/java/io/janusproject/tests/services/network/NetworkConfigTest.java
index 5d8f88c6a0..82c1b87f7b 100644
--- a/sre/io.janusproject/io.janusproject.tests/src/test/java/io/janusproject/tests/services/network/NetworkConfigTest.java
+++ b/sre/io.janusproject/io.janusproject.tests/src/test/java/io/janusproject/tests/services/network/NetworkConfigTest.java
@@ -27,7 +27,7 @@
 
 import com.google.common.base.Charsets;
 
-import io.janusproject.kernel.services.gson.GsonEventSerializer;
+import io.janusproject.kernel.services.jdk.network.JavaBinaryEventSerializer;
 import io.janusproject.kernel.services.jdk.network.PlainTextEventEncrypter;
 import io.janusproject.services.network.NetworkConfig;
 import io.janusproject.tests.testutils.AbstractJanusTest;
@@ -48,7 +48,7 @@ public void getDefaultValues() {
 
 		// Use hard-coded string to ensure retro compatibility
 		assertEquals("", defs.get("network.encrypter.aes.key")); //$NON-NLS-1$ //$NON-NLS-2$
-		assertEquals(GsonEventSerializer.class.getName(), defs.get("network.serializer.class")); //$NON-NLS-1$
+		assertEquals(JavaBinaryEventSerializer.class.getName(), defs.get("network.serializer.class")); //$NON-NLS-1$
 		assertEquals(PlainTextEventEncrypter.class.getName(), defs.get("network.encrypter.class")); //$NON-NLS-1$
 		assertEquals(Charsets.UTF_8.name(), defs.get("network.serializer.charset")); //$NON-NLS-1$
 	}