diff --git a/package-lock.json b/package-lock.json
index 501e6f66..59b8bd3f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "1.0.0",
       "license": "ISC",
       "dependencies": {
-        "govuk-frontend": "~5.3.0",
+        "govuk-frontend": "~5.4.0",
         "govuk-one-login-service-header": "govuk-one-login/service-header#f9ce92e4e9f5a8c0311e77bce211520a785e4ebc"
       },
       "devDependencies": {
@@ -233,9 +233,9 @@
       }
     },
     "node_modules/govuk-frontend": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.3.1.tgz",
-      "integrity": "sha512-EzegdVdmZVwXUGTQTsBgK4TkMpMyPdOIa2g1kvwX7EeyP9Kah+amXSo97gbiI8N49L6E0J6/2H6qLW4QN3KhMQ==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/govuk-frontend/-/govuk-frontend-5.4.0.tgz",
+      "integrity": "sha512-F3YwQYrYQqIPfNxsoph6O78Ey1unCB6cy6omx8KeWY9G504lWZFBSIaiUCma1jNLw9bOUU7Ui+tXG09jjqy0Mw==",
       "engines": {
         "node": ">= 4.2.0"
       }
diff --git a/package.json b/package.json
index 8952cb12..1894fe84 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "govuk-frontend": "~5.3.0",
+    "govuk-frontend": "~5.4.0",
     "govuk-one-login-service-header": "govuk-one-login/service-header#f9ce92e4e9f5a8c0311e77bce211520a785e4ebc"
   },
   "devDependencies": {
diff --git a/pyproject.toml b/pyproject.toml
index 1d8fcde6..43b4ddcb 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -9,8 +9,8 @@ dependencies = [
     "dataclass-wizard~=0.22.0",
     "flask~=3.0.0",
     "flask-session[sqlalchemy]~=0.8.0",
-    "govuk-frontend-jinja~=3.0.0",
-    "govuk-frontend-wtf~=3.0.0",
+    "govuk-frontend-jinja~=3.1.0",
+    "govuk-frontend-wtf~=3.1.0",
     "gunicorn~=22.0.0",
     "inject~=5.2.0",
     "pg8000~=1.31.0",
diff --git a/tests/e2e/pages.py b/tests/e2e/pages.py
index 91b1984e..e18aacea 100644
--- a/tests/e2e/pages.py
+++ b/tests/e2e/pages.py
@@ -138,8 +138,8 @@ def __init__(self, banner: Locator):
         self._heading = banner.get_by_role("paragraph")
 
     @property
-    def heading(self) -> str | None:
-        return self._heading.text_content()
+    def heading(self) -> str:
+        return (self._heading.text_content() or "").strip()
 
     @classmethod
     def for_important(cls, page: Page) -> NotificationBannerComponent:
diff --git a/tests/integration/pages.py b/tests/integration/pages.py
index 474d9e68..7d866987 100644
--- a/tests/integration/pages.py
+++ b/tests/integration/pages.py
@@ -383,7 +383,7 @@ def __iter__(self) -> Iterator[str]:
 
 class NotificationBannerComponent:
     def __init__(self, banner: Tag):
-        self.heading = one(banner.select("p")).string
+        self.heading = (one(banner.select("p")).string or "").strip()
 
     @classmethod
     def for_important(cls, soup: BeautifulSoup) -> NotificationBannerComponent | None:
diff --git a/tests/integration/test_scheme_funding.py b/tests/integration/test_scheme_funding.py
index 7f261f4d..4130f5a9 100644
--- a/tests/integration/test_scheme_funding.py
+++ b/tests/integration/test_scheme_funding.py
@@ -293,7 +293,7 @@ def test_cannot_spend_to_date_when_error(
         assert (
             change_spend_to_date_page.form.amount.is_errored
             and change_spend_to_date_page.form.amount.error == "Error: Enter spend to date"
-            and change_spend_to_date_page.form.amount.value is None
+            and change_spend_to_date_page.form.amount.value == ""
         )
         actual_scheme = schemes.get(1)
         assert actual_scheme