diff --git a/Server/DataStructures/BaseDataFacade.h b/Server/DataStructures/BaseDataFacade.h
index e9a551c6e..6c4726a9c 100644
--- a/Server/DataStructures/BaseDataFacade.h
+++ b/Server/DataStructures/BaseDataFacade.h
@@ -114,7 +114,7 @@ public:
     std::string GetEscapedNameForNameID(const unsigned name_id) const {
         std::string temporary_string;
         GetName(name_id, temporary_string);
-        return HTMLEntitize(temporary_string);
+        return EscapeJSONString(temporary_string);
     }
 
     virtual std::string GetTimestamp() const = 0;