diff --git a/.cirrus.star b/.cirrus.star
index e9bb672b9593..b1662850ed07 100644
--- a/.cirrus.star
+++ b/.cirrus.star
@@ -96,6 +96,7 @@ def compute_environment_vars():
 
     operating_systems = [
       'compilerwarnings',
+      'formattingcheck',
       'freebsd',
       'linux',
       'macos',
diff --git a/.cirrus.tasks.yml b/.cirrus.tasks.yml
index 038d043d00e7..a47d95d1cd16 100644
--- a/.cirrus.tasks.yml
+++ b/.cirrus.tasks.yml
@@ -1021,3 +1021,40 @@ task:
 
   always:
     upload_caches: ccache
+
+
+# Check that code follows formatting standards
+task:
+  name: FormattingCheck
+
+  env:
+    CPUS: 2
+    IMAGE_FAMILY: pg-ci-bookworm
+
+  <<: *linux_task_template
+
+  depends_on: SanityCheck
+  only_if: $CI_FORMATTINGCHECK_ENABLED
+  allow_failures: true
+
+  create_user_script: |
+    useradd -m postgres
+    chown -R postgres:postgres .
+
+  # Configure and build pg_bsd_indent
+  configure_script: |
+    su postgres <<-EOF
+      meson setup --auto-features=disabled build
+    EOF
+
+  build_pg_bsd_indent_script: |
+    su postgres <<-EOF
+      ninja -C build src/tools/pg_bsd_indent/pg_bsd_indent
+    EOF
+
+  # Check C code formatting with pgindent
+  check_pgindent_script: |
+    su postgres <<-EOF
+      export PATH="$(pwd)/build/src/tools/pg_bsd_indent:\$PATH"
+      src/tools/pgindent/pgindent --check --diff src contrib
+    EOF
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index 7dd75a490aab..d49be15100bd 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -5218,8 +5218,8 @@ enable_statement_timeout(void)
 	if (StatementTimeout > 0
 		&& (StatementTimeout < TransactionTimeout || TransactionTimeout == 0))
 	{
-		if (!get_timeout_active(STATEMENT_TIMEOUT))
-			enable_timeout_after(STATEMENT_TIMEOUT, StatementTimeout);
+if (!get_timeout_active(STATEMENT_TIMEOUT))
+	enable_timeout_after(STATEMENT_TIMEOUT, StatementTimeout);
 	}
 	else
 	{