diff --git a/packages/webapp/src/classes/client/cache-decorator-client/index.ts b/packages/webapp/src/classes/client/cache-decorator-client/index.ts
index e1106151..9cca37c2 100644
--- a/packages/webapp/src/classes/client/cache-decorator-client/index.ts
+++ b/packages/webapp/src/classes/client/cache-decorator-client/index.ts
@@ -129,9 +129,9 @@ class CacheDecoratorClient implements Client {
     revertHistory(id: number, cid: number): Promise<void> {
         return this.client.revertHistory(id, cid);
     }
-    
-    buildPersistenceManager(): PersistenceManager {
-        return this.client.buildPersistenceManager();
+
+    buildPersistenceManager(isTryMode: boolean): PersistenceManager {
+        return this.client.buildPersistenceManager(isTryMode);
     }
 
     removePersistenceManager(): void {
diff --git a/packages/webapp/src/classes/client/index.ts b/packages/webapp/src/classes/client/index.ts
index f64ba644..22ade730 100644
--- a/packages/webapp/src/classes/client/index.ts
+++ b/packages/webapp/src/classes/client/index.ts
@@ -107,9 +107,9 @@ interface Client {
     fetchHistory(id: number): Promise<ChangeHistory[]>;
     revertHistory(id: number, cid: number): Promise<void>;
 
-    fetchMindmap(id:number): Mindmap;
+    fetchMindmap(id: number): Mindmap;
 
-    buildPersistenceManager(): PersistenceManager;
+    buildPersistenceManager(isTryMode: boolean): PersistenceManager;
     removePersistenceManager(): void;
 
     onSessionExpired(callback?: () => void): () => void;
diff --git a/packages/webapp/src/classes/client/mock-client/index.ts b/packages/webapp/src/classes/client/mock-client/index.ts
index a52e094f..9d193e21 100644
--- a/packages/webapp/src/classes/client/mock-client/index.ts
+++ b/packages/webapp/src/classes/client/mock-client/index.ts
@@ -36,7 +36,7 @@ class MockClient implements Client {
     private labels: Label[] = [];
     private permissionsByMap: Map<number, Permission[]> = new Map();
     private persistenceManager: PersistenceManager;
-    
+
     constructor() {
         // Remove, just for develop ....
         function createMapInfo(
@@ -98,7 +98,7 @@ class MockClient implements Client {
                 12,
                 false,
                 'El Mapa3',
-                [label2, label3], 
+                [label2, label3],
                 'Paulo3',
                 '2008-06-02T00:00:00Z',
                 'Berna',
@@ -115,7 +115,7 @@ class MockClient implements Client {
     onSessionExpired(callback?: () => void): () => void {
         return callback;
     }
-    
+
     fetchMindmap(id: number): Mindmap {
         const parser = new DOMParser();
         const xmlDoc = parser.parseFromString(`
@@ -335,7 +335,7 @@ class MockClient implements Client {
 
     createLabel(title: string, color: string): Promise<number> {
         const newId = Math.max.apply(Number, this.labels.map(l => l.id)) + 1;
-        this.labels.push({ 
+        this.labels.push({
             id: newId,
             title,
             color,
@@ -346,8 +346,8 @@ class MockClient implements Client {
     deleteLabel(id: number): Promise<void> {
         this.labels = this.labels.filter((l) => l.id != id);
         this.maps = this.maps.map(m => {
-            return { 
-                ...m, 
+            return {
+                ...m,
                 labels: m.labels.filter((l) => l.id != id)
             };
         });
@@ -357,7 +357,7 @@ class MockClient implements Client {
     addLabelToMap(labelId: number, mapId: number): Promise<void> {
         const labelToAdd = this.labels.find((l) => l.id === labelId);
         if (!labelToAdd) {
-            return Promise.reject({ msg: `unable to find label with id ${labelId}`});
+            return Promise.reject({ msg: `unable to find label with id ${labelId}` });
         }
         const map = this.maps.find((m) => m.id === mapId);
         if (!map) {
@@ -400,14 +400,14 @@ class MockClient implements Client {
     }
 
     buildPersistenceManager(): PersistenceManager {
-        if (this.persistenceManager){
+        if (this.persistenceManager) {
             return this.persistenceManager;
         }
         const persistence: PersistenceManager = new MockPersistenceManager(exampleMap);
         this.persistenceManager = persistence;
         return persistence;
     }
-    
+
     removePersistenceManager(): void {
         if (this.persistenceManager) {
             delete this.persistenceManager;
diff --git a/packages/webapp/src/classes/client/rest-client/index.ts b/packages/webapp/src/classes/client/rest-client/index.ts
index 74fc6d84..548b0208 100644
--- a/packages/webapp/src/classes/client/rest-client/index.ts
+++ b/packages/webapp/src/classes/client/rest-client/index.ts
@@ -39,12 +39,12 @@ export default class RestClient implements Client {
         }
         this.axios.interceptors.response.use((r) => r, (r) => this.checkResponseForSessionExpired(r));
     }
-    
-    private _onSessionExpired : () => void;
+
+    private _onSessionExpired: () => void;
     onSessionExpired(callback?: () => void): () => void {
         if (callback) {
             this._onSessionExpired = callback;
-        } 
+        }
         return this._onSessionExpired;
     }
 
@@ -611,13 +611,13 @@ export default class RestClient implements Client {
         }
     }
 
-    buildPersistenceManager(): PersistenceManager {
-        if (this.persistenceManager){
+    buildPersistenceManager(isTryMode: boolean): PersistenceManager {
+        if (this.persistenceManager) {
             return this.persistenceManager;
         }
         // TODO: Move globals out, make urls configurable
         let persistence: PersistenceManager;
-        if (!global.memoryPersistence && !global.readOnly) {
+        if (!isTryMode) {
             persistence = new RESTPersistenceManager({
                 documentUrl: '/c/restful/maps/{id}/document',
                 revertUrl: '/c/restful/maps/{id}/history/latest',
diff --git a/packages/webapp/src/components/editor-page/index.tsx b/packages/webapp/src/components/editor-page/index.tsx
index e65061eb..023be79b 100644
--- a/packages/webapp/src/components/editor-page/index.tsx
+++ b/packages/webapp/src/components/editor-page/index.tsx
@@ -24,7 +24,7 @@ const EditorPage = ({ isTryMode }: EditorPropsType): React.ReactElement => {
 
     useEffect(() => {
         ReactGA.pageview(window.location.pathname + window.location.search);
-        const persistence = client.buildPersistenceManager();
+        const persistence = client.buildPersistenceManager(isTryMode);
         setPersistenceManager(persistence);
         return () => client.removePersistenceManager();
     }, []);