diff --git a/cryptoservice/crypto_service.go b/cryptoservice/crypto_service.go
index 8aa0f214f7..583754a43a 100644
--- a/cryptoservice/crypto_service.go
+++ b/cryptoservice/crypto_service.go
@@ -110,7 +110,6 @@ func (cs *CryptoService) RemoveKey(keyID string) (err error) {
 				continue
 			}
 			err = ks.RemoveKey(keyPath)
-			return
 		}
 	}
 	return // returns whatever the final values were