diff --git a/src/app/services/cryptoService.js b/src/app/services/cryptoService.js
index a168cd7394..b5d3f0f50b 100644
--- a/src/app/services/cryptoService.js
+++ b/src/app/services/cryptoService.js
@@ -623,6 +623,10 @@ angular
                 throw 'Encryption key unavailable.';
             }
 
+            if (key.macKey && !macBuf) {
+                throw 'macBuf required for this type of key.';
+            }
+
             if (encType !== key.encType) {
                 throw 'encType unavailable.';
             }