diff --git a/signer/storage/storage.go b/signer/storage/storage.go
index b451b2a6a8..2afccf65c4 100644
--- a/signer/storage/storage.go
+++ b/signer/storage/storage.go
@@ -63,6 +63,11 @@ func (s *Storage) Get(key string) (string, error) {
 		return "", err
 	}
 
+	if len(s.key) == 0 {
+		// if there is no key for decryption, just store the value
+		return data, nil
+	}
+
 	cred := StoredCredential{}
 	if err = json.Unmarshal([]byte(data), &cred); err != nil {
 		log.Warn("Failed to unmarshal encrypted credential", "err", err)
@@ -85,6 +90,11 @@ func (s *Storage) Put(key, value string) error {
 		return ErrZeroKey
 	}
 
+	if len(s.key) == 0 {
+		// if there is no key for encryption, just store the value
+		return s.api.Put(key, value)
+	}
+
 	ciphertext, iv, err := Encrypt(s.key, []byte(value), []byte(key))
 	if err != nil {
 		log.Warn("Failed to encrypt entry", "err", err)