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