diff --git a/services/web/test/frontend/components/pdf-preview/pdf-preview-detached-root.spec.tsx b/services/web/test/frontend/components/pdf-preview/pdf-preview-detached-root.spec.tsx
index a88477308a..19f8bb1a45 100644
--- a/services/web/test/frontend/components/pdf-preview/pdf-preview-detached-root.spec.tsx
+++ b/services/web/test/frontend/components/pdf-preview/pdf-preview-detached-root.spec.tsx
@@ -62,7 +62,7 @@ describe('<PdfPreviewDetachedRoot/>', function () {
     cy.findByRole('button', { name: 'Clear cached files' })
       .should('not.be.disabled')
       .click()
-      .then(() => {
+      .should(() => {
         expect(sysendTestHelper.getLastBroacastMessage()).to.deep.equal({
           role: 'detached',
           event: 'action-clearCache',
diff --git a/services/web/test/frontend/helpers/sysend.js b/services/web/test/frontend/helpers/sysend.js
index 214e168b20..59a1997f96 100644
--- a/services/web/test/frontend/helpers/sysend.js
+++ b/services/web/test/frontend/helpers/sysend.js
@@ -22,7 +22,7 @@ function getLastDetachCall(method) {
 }
 
 function getLastBroacastMessage() {
-  return getLastDetachCall('broadcast').args[1]
+  return getLastDetachCall('broadcast')?.args[1]
 }
 
 function getAllBroacastMessages() {
@@ -32,7 +32,7 @@ function getAllBroacastMessages() {
 // this fakes receiving a message by calling the handler add to `on`. A bit
 // funky, but works for now
 function receiveMessage(message) {
-  getLastDetachCall('on').args[1](message)
+  getLastDetachCall('on')?.args[1](message)
 }
 
 export default {