diff --git a/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java b/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
index c717a3a705d..5ffa14f3088 100755
--- a/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
+++ b/utils/src/com/cloud/utils/crypt/EncryptionSecretKeyChecker.java
@@ -71,6 +71,11 @@ public class EncryptionSecretKeyChecker extends AdapterBase implements SystemInt
             if(encryptionType == null || encryptionType.equals("none")){
                 return;
             }
+            
+            if (s_useEncryption) {
+            	s_logger.warn("Encryption already enabled, is check() called twice?");
+            	return;
+            }
 
             s_encryptor.setAlgorithm("PBEWithMD5AndDES");
             String secretKey = null;