diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseEncoder.java b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseEncoder.java
index 873ee66..bc66aad 100644
--- a/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseEncoder.java
+++ b/src/main/java/ch/unibas/dmi/dbis/cs108/casono/server/network/response/ResponseEncoder.java
@@ -49,8 +49,9 @@ public class ResponseEncoder {
     }
 
     private static String maskIfNeeded(String value) {
-        if (value.contains(" ")) {
-            return "'" + value + "'";
+        if (value.contains(" ") || value.contains("'")) {
+            String escaped = value.replace("'", "\\'");
+            return "'" + escaped + "'";
         }
         return value;
     }