diff --git a/src/EncryptedFieldValueManager.php b/src/EncryptedFieldValueManager.php
index b83e8db..7659ac2 100644
--- a/src/EncryptedFieldValueManager.php
+++ b/src/EncryptedFieldValueManager.php
@@ -58,7 +58,7 @@ class EncryptedFieldValueManager implements EncryptedFieldValueManagerInterface
       // Create a new EncryptedFieldValue entity. The parent entity's (revision)
       // id might not be known yet, so the EncryptedFieldValue will be saved
       // by saveEncryptedFieldValues() later on.
-      $encrypted_field_value = $this->entityManager->getStorage($entity->getEntityTypeId())->create([
+      $encrypted_field_value = $this->entityManager->getStorage('encrypted_field_value')->create([
         'entity_type' => $entity->getEntityTypeId(),
         'entity_id' => !$entity->isNew() ? $entity->id() : NULL,
         'entity_revision_id' => $this->getEntityRevisionId($entity),
diff --git a/tests/src/Unit/FieldEncryptProcessEntitiesTest.php b/tests/src/Unit/FieldEncryptProcessEntitiesTest.php
index 47d8f15..ba1da3b 100644
--- a/tests/src/Unit/FieldEncryptProcessEntitiesTest.php
+++ b/tests/src/Unit/FieldEncryptProcessEntitiesTest.php
@@ -11,6 +11,7 @@ use Drupal\Core\DependencyInjection\ContainerBuilder;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\Core\Field\BaseFieldDefinition;
 use Drupal\Core\TypedData\DataDefinition;
+use Drupal\encrypt\EncryptionProfileInterface;
 use Drupal\field_encrypt\FieldEncryptProcessEntities;
 use Drupal\Tests\UnitTestCase;
 
@@ -143,7 +144,7 @@ class FieldEncryptProcessEntitiesTest extends UnitTestCase {
       ->disableOriginalConstructor()
       ->getMock();
 
-    $this->encryptionProfile = $this->getMockBuilder('\Drupal\encrypt\EncryptionProfile')
+    $this->encryptionProfile = $this->getMockBuilder(EncryptionProfileInterface::class)
       ->disableOriginalConstructor()
       ->getMock();