diff --git a/CHANGELOG.md b/CHANGELOG.md
index a582eff..6911d0c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+Drupal 11 with all the previous patches merged.
+
 <!-- markdownlint-disable MD024 -->
 # OS2Forms Change Log
 
@@ -34,6 +36,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa
   Fixing OS2Forms autocomplete field logger
 - [#321](https://github.com/OS2Forms/os2forms/issues/321) [PR-381](https://github.com/OS2Forms/os2forms/pull/381)
   Removing SaveToFileWebformHandler (id: save_to_file)
+- [#380](https://github.com/OS2Forms/os2forms/pull/380)
+  Computed twig encryption fix
 
 ## [6.1.0] 2026-10-22
 
diff --git a/modules/os2forms_encrypt/src/WebformOs2FormsEncryptSubmissionStorage.php b/modules/os2forms_encrypt/src/WebformOs2FormsEncryptSubmissionStorage.php
index d23ee15..d135742 100644
--- a/modules/os2forms_encrypt/src/WebformOs2FormsEncryptSubmissionStorage.php
+++ b/modules/os2forms_encrypt/src/WebformOs2FormsEncryptSubmissionStorage.php
@@ -184,6 +184,15 @@ public function getColumns(?WebformInterface $webform = NULL, ?EntityInterface $
     }
   }
 
+  /**
+   * {@inheritdoc}
+   *
+   * Normalizes stringable values before passing them to encryption methods.
+   */
+  protected function encrypt($string, EncryptionProfileInterface $encryption_profile) {
+    return parent::encrypt((string) $string, $encryption_profile);
+  }
+
   /**
    * {@inheritdoc}
    *