diff --git a/main/frontend-api/src/main/java/org/cryptomator/frontend/FrontendId.java b/main/frontend-api/src/main/java/org/cryptomator/frontend/FrontendId.java
index 2d79eefbc..d5608bdac 100644
--- a/main/frontend-api/src/main/java/org/cryptomator/frontend/FrontendId.java
+++ b/main/frontend-api/src/main/java/org/cryptomator/frontend/FrontendId.java
@@ -2,12 +2,13 @@ package org.cryptomator.frontend;
 
 import static java.util.UUID.randomUUID;
 
+import java.io.Serializable;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.util.Base64;
 import java.util.UUID;
 
-public class FrontendId {
+public class FrontendId implements Serializable {
 
 	public static final String FRONTEND_ID_PATTERN = "[a-zA-Z0-9_-]{12}";
 
diff --git a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/Tarpit.java b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/Tarpit.java
index 42226b3db..011adddc6 100644
--- a/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/Tarpit.java
+++ b/main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/Tarpit.java
@@ -8,6 +8,7 @@ package org.cryptomator.frontend.webdav;
 import static java.lang.Math.max;
 import static java.lang.System.currentTimeMillis;
 
+import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
@@ -21,7 +22,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Singleton
-class Tarpit {
+class Tarpit implements Serializable {
 
 	private static final Logger LOG = LoggerFactory.getLogger(Tarpit.class);
 	private static final long DELAY_MS = 10000;