diff --git a/packages/file-handling/src/file-sink.js b/packages/file-handling/src/file-sink.js
index 706aeba4a0183a448727b25c386b46a6ecf4c73d..db3e6790ed6674ad1660a276881fa2317398ccac 100644
--- a/packages/file-handling/src/file-sink.js
+++ b/packages/file-handling/src/file-sink.js
@@ -204,7 +204,7 @@ export class FileSink extends ScopedElementsMixin(DbpFileHandlingLitElement) {
         const filePicker = this._('#nextcloud-file-picker');
 
         if (filePicker) {
-            filePicker.checkSessionStorage().then(contents => {
+            filePicker.checkLocalStorage().then(contents => {
                 if (filePicker.webDavClient !== null) {
                     filePicker.loadDirectory(filePicker.directoryPath);
                 }
diff --git a/packages/file-handling/src/file-source.js b/packages/file-handling/src/file-source.js
index deb6bc3fbda40ae1b782df2972f50dc2a6fb5cbd..622a2ae90c34d099f01163d5ceb1e83b835d0da1 100644
--- a/packages/file-handling/src/file-source.js
+++ b/packages/file-handling/src/file-source.js
@@ -409,7 +409,7 @@ export class FileSource extends ScopedElementsMixin(DbpFileHandlingLitElement) {
         const filePicker = this._('#nextcloud-file-picker');
         // check if element is already in the dom (for example if "dialog-open" attribute is set)
         if (filePicker) {
-            filePicker.checkSessionStorage().then(contents => {
+            filePicker.checkLocalStorage().then(contents => {
                 if (filePicker.webDavClient !== null) {
                     filePicker.loadDirectory(filePicker.directoryPath);
                 }
diff --git a/packages/file-handling/src/nextcloud-file-picker.js b/packages/file-handling/src/nextcloud-file-picker.js
index 8beb5d9ac2c4160c1e7a50643565425532eb7069..87cc23f6d727d030a31bc0761fc28375d099783d 100644
--- a/packages/file-handling/src/nextcloud-file-picker.js
+++ b/packages/file-handling/src/nextcloud-file-picker.js
@@ -392,7 +392,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
     }
 
     loginCallback() {
-        this.checkSessionStorage()
+        this.checkLocalStorage()
     }
 
     /**
@@ -421,18 +421,18 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
     /**
      *
      */
-    async checkSessionStorage() {
+    async checkLocalStorage() {
         if (!this.isLoggedIn() || !this.auth)
             return;
         const publicId = this.auth['person-id'];
         const token = parseJwt(this.auth.token);
         const sessionId = token ? token.sid : "";
         if (this.storeSession && sessionId
-            && sessionStorage.getItem("nextcloud-webdav-username" + publicId)
-            && sessionStorage.getItem("nextcloud-webdav-password" + publicId) ){
+            && localStorage.getItem("nextcloud-webdav-username" + publicId)
+            && localStorage.getItem("nextcloud-webdav-password" + publicId) ){
                 try {
-                    const userName = await decrypt(sessionId, sessionStorage.getItem("nextcloud-webdav-username" + publicId));
-                    const password = await decrypt(sessionId, sessionStorage.getItem("nextcloud-webdav-password" + publicId));
+                    const userName = await decrypt(sessionId, localStorage.getItem("nextcloud-webdav-username" + publicId));
+                    const password = await decrypt(sessionId, localStorage.getItem("nextcloud-webdav-password" + publicId));
                     this.webDavClient = createClient(
                         this.webDavUrl + "/" + userName,
                         {
@@ -444,8 +444,8 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
                     this.isPickerActive = true;
                     this.loadDirectory(this.directoryPath);
                 } catch (e) {
-                    sessionStorage.removeItem('nextcloud-webdav-username' + publicId);
-                    sessionStorage.removeItem('nextcloud-webdav-password' + publicId);
+                    localStorage.removeItem('nextcloud-webdav-username' + publicId);
+                    localStorage.removeItem('nextcloud-webdav-password' + publicId);
                     return;
                 }
         }
@@ -528,8 +528,8 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
                     if (sessionId) {
                         const encrytedName = await encrypt(sessionId, data.loginName);
                         const encrytedToken = await encrypt(sessionId, data.token);
-                        sessionStorage.setItem('nextcloud-webdav-username' + publicId, encrytedName);
-                        sessionStorage.setItem('nextcloud-webdav-password' + publicId, encrytedToken);
+                        localStorage.setItem('nextcloud-webdav-username' + publicId, encrytedName);
+                        localStorage.setItem('nextcloud-webdav-password' + publicId, encrytedToken);
 
                     }
                 }
@@ -1235,8 +1235,8 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
         this.isPickerActive = false;
         if (this.auth) {
             const publicId = this.auth['person-id'];
-            sessionStorage.removeItem('nextcloud-webdav-username' + publicId);
-            sessionStorage.removeItem('nextcloud-webdav-password' + publicId);
+            localStorage.removeItem('nextcloud-webdav-username' + publicId);
+            localStorage.removeItem('nextcloud-webdav-password' + publicId);
         }
     }