diff --git a/g10/encrypt.c b/g10/encrypt.c
index 3d8d9160f..d84596939 100644
--- a/g10/encrypt.c
+++ b/g10/encrypt.c
@@ -262,6 +262,10 @@ use_aead (pk_list_t pk_list, int algo)
 {
   int can_use;
 
+  if (!(opt.compat_flags & COMPAT_VSD_ALLOW_OCB)
+      && opt.compliance == CO_DE_VS)
+    return 0;  /* Not yet allowed.  */
+
   can_use = openpgp_cipher_get_algo_blklen (algo) == 16;
 
   /* With --force-aead we want AEAD.  */