diff --git a/src/dbp-qualified-signature-pdf-upload.js b/src/dbp-qualified-signature-pdf-upload.js
index 97270b07..889e1954 100644
--- a/src/dbp-qualified-signature-pdf-upload.js
+++ b/src/dbp-qualified-signature-pdf-upload.js
@@ -180,6 +180,7 @@ class QualifiedSignaturePdfUpload extends ScopedElementsMixin(DBPSignatureLitEle
         const entry = this.takeFileFromQueue(key);
         const file = entry.file;
         this.currentFile = file;
+        this.currentKey = key;
 
         // set placement mode and parameters to restore them when canceled
         this.currentFilePlacementMode = this.queuedFilesPlacementModes[key];
diff --git a/src/dbp-signature-lit-element.js b/src/dbp-signature-lit-element.js
index 576920e1..c670c8f7 100644
--- a/src/dbp-signature-lit-element.js
+++ b/src/dbp-signature-lit-element.js
@@ -43,6 +43,7 @@ export default class DBPSignatureLitElement extends BaseLitElement {
         this.currentFileName = '';
         this.currentFilePlacementMode = '';
         this.currentFileSignaturePlacement = {};
+        this.currentKey = '';
         this.queuedFilesAnnotations = [];
         this.queuedFilesAnnotationsCount = 0;
         this.uploadStatusFileName = '';
@@ -92,6 +93,7 @@ export default class DBPSignatureLitElement extends BaseLitElement {
             queueBlockEnabled: {type: Boolean, attribute: false},
             currentFile: {type: Object, attribute: false},
             currentFileName: {type: String, attribute: false},
+            currentKey: {type: String, attribute: false},
             signaturePlacementInProgress: {type: Boolean, attribute: false},
             withSigBlock: {type: Boolean, attribute: false},
             isSignaturePlacement: {type: Boolean, attribute: false},
@@ -131,7 +133,7 @@ export default class DBPSignatureLitElement extends BaseLitElement {
      * @returns {Promise<string>} key of the re-queued item
      */
     async reQueueFile(file) {
-        const key = String(this._queueKey);
+        const key = this.currentKey;
         this.queuedFiles[key] = new SignatureEntry(key, file);
         this.updateQueuedFilesCount();