diff --git a/src/Components/File/File.vue b/src/Components/File/File.vue
index db64b99653..4b945829d5 100644
--- a/src/Components/File/File.vue
+++ b/src/Components/File/File.vue
@@ -20,7 +20,7 @@
 
 <script>
 import FileIcon from 'vue-material-design-icons/File.vue'
-import { generateOcsUrl } from '@nextcloud/router'
+import { generateUrl, generateOcsUrl } from '@nextcloud/router'
 import { useFilesStore } from '../../store/files.js'
 
 export default {
@@ -57,23 +57,27 @@ export default {
 			if (this.backgroundFailed === true) {
 				return null
 			}
-			try {
-				const previewUrl = generateOcsUrl('/apps/libresign/api/v1/file/thumbnail/{nodeId}', {
+			let previewUrl = ''
+			if (Object.hasOwn(this.filesStore.getFile(), 'uuid')) {
+				previewUrl = generateOcsUrl('/apps/libresign/api/v1/file/thumbnail/{nodeId}', {
 					nodeId: this.currentNodeId,
 				})
-				const url = new URL(previewUrl)
+			} else {
+				previewUrl = window.location.origin + generateUrl('/core/preview?fileId={fileid}', {
+					fileid: this.filesStore.getFile().nodeId,
+				})
+			}
 
-				// Request tiny previews
-				url.searchParams.set('x', this.gridMode ? '128' : '32')
-				url.searchParams.set('y', this.gridMode ? '128' : '32')
-				url.searchParams.set('mimeFallback', 'true')
+			const url = new URL(previewUrl)
 
-				// Handle cropping
-				url.searchParams.set('a', this.cropPreviews === true ? '0' : '1')
-				return url
-			} catch (e) {
-				return null
-			}
+			// Request tiny previews
+			url.searchParams.set('x', this.gridMode ? '128' : '32')
+			url.searchParams.set('y', this.gridMode ? '128' : '32')
+			url.searchParams.set('mimeFallback', 'true')
+
+			// Handle cropping
+			url.searchParams.set('a', this.cropPreviews === true ? '0' : '1')
+			return url
 		},
 	},
 	methods: {
diff --git a/src/Components/Request/RequestSignature.vue b/src/Components/Request/RequestSignature.vue
index 6dba93467b..c2bf05f8e9 100644
--- a/src/Components/Request/RequestSignature.vue
+++ b/src/Components/Request/RequestSignature.vue
@@ -6,7 +6,7 @@
 	<div v-else
 		id="request-signature-list-signers">
 		<NcButton v-if="canRequestSign && !filesStore.isFullSigned()"
-			:type="dataSigners.length === 0 ? 'primary' : 'secondary'"
+			:type="hasSigners ? 'primary' : 'secondary'"
 			@click="addSigner">
 			{{ t('libresign', 'Add signer') }}
 		</NcButton>
@@ -123,6 +123,9 @@ export default {
 		dataSigners() {
 			return this.filesStore.files[this.filesStore.selectedNodeId].signers
 		},
+		hasSigners() {
+			return this.filesStore.hasSigners()
+		},
 	},
 	watch: {
 		signers(signers) {
diff --git a/src/store/files.js b/src/store/files.js
index eee513abf3..9c86c11092 100644
--- a/src/store/files.js
+++ b/src/store/files.js
@@ -52,6 +52,15 @@ export const useFilesStore = defineStore('files', {
 		disableIdentifySigner() {
 			this.identifyingSigner = false
 		},
+		hasSigners() {
+			if (this.selectedNodeId === 0) {
+				return false
+			}
+			if (!Object.hasOwn(this.getFile(), 'signers')) {
+				return false
+			}
+			return this.files[this.selectedNodeId].signers.length > 0
+		},
 		isPartialSigned() {
 			if (this.selectedNodeId === 0) {
 				return false