diff --git a/proprietary/wvm/WVMExtractorImpl.cpp b/proprietary/wvm/WVMExtractorImpl.cpp
index 4bfb3aa4..af77d037 100644
--- a/proprietary/wvm/WVMExtractorImpl.cpp
+++ b/proprietary/wvm/WVMExtractorImpl.cpp
@@ -204,9 +204,11 @@ void WVMExtractorImpl::Initialize()
 
     if (mSetupStatus != OK) {
         setError(mSetupStatus);
+#ifdef REQUIRE_SECURE_BUFFERS
         if (mCryptoInitialized) {
             OEMCrypto_Terminate();
         }
+#endif
     }
 
     WV_SetWarningToErrorMS(10000);