From 799478c16f8521377bff3618f7a644d34c30aab2 Mon Sep 17 00:00:00 2001
From: Valery Baranov <klammrock@gmail.com>
Date: Wed, 29 Jul 2026 13:19:14 +0300
Subject: [PATCH] CASSANDRA-21540 Fix startup fails when TDE is enabled

---
 .../org/apache/cassandra/config/DatabaseDescriptor.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
index 5bc6de7ac1e..0bb753cb37f 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -395,6 +395,8 @@ public static void toolInitialization(boolean failIfDaemonOrClient)
 
         applyCompressorProviders();
 
+        applyEncryptionContext();
+
         applySimpleConfig();
 
         applyPartitioner();
@@ -402,8 +404,6 @@ public static void toolInitialization(boolean failIfDaemonOrClient)
         applySnitch();
 
         applyFailureDetector();
-
-        applyEncryptionContext();
     }
 
     /**
@@ -577,6 +577,8 @@ private static void applyAll() throws ConfigurationException
 
         applyCryptoProvider();
 
+        applyEncryptionContext();
+
         applySimpleConfig();
 
         applyPartitioner();
@@ -591,8 +593,6 @@ private static void applyAll() throws ConfigurationException
 
         applySeedProvider();
 
-        applyEncryptionContext();
-
         applySslContext();
 
         createAllDirectories();