diff --git a/src/app/server/Server.cpp b/src/app/server/Server.cpp
index 3582312f09..4a0fa91f56 100644
--- a/src/app/server/Server.cpp
+++ b/src/app/server/Server.cpp
@@ -674,11 +674,7 @@ void Server::ResumeSubscriptions()
 Credentials::IgnoreCertificateValidityPeriodPolicy Server::sDefaultCertValidityPolicy;
 
 KvsPersistentStorageDelegate CommonCaseDeviceServerInitParams::sKvsPersistenStorageDelegate;
-#if CHIP_CRYPTO_PSA
-PSAOperationalKeystore CommonCaseDeviceServerInitParams::sPSAOperationalKeystore;
-#else
 PersistentStorageOperationalKeystore CommonCaseDeviceServerInitParams::sPersistentStorageOperationalKeystore;
-#endif
 Credentials::PersistentStorageOpCertStore CommonCaseDeviceServerInitParams::sPersistentStorageOpCertStore;
 Credentials::GroupDataProviderImpl CommonCaseDeviceServerInitParams::sGroupDataProvider;
 app::DefaultTimerDelegate CommonCaseDeviceServerInitParams::sTimerDelegate;
diff --git a/src/app/server/Server.h b/src/app/server/Server.h
index f71af57678..e574b52b15 100644
--- a/src/app/server/Server.h
+++ b/src/app/server/Server.h
@@ -41,11 +41,7 @@
 #include <credentials/PersistentStorageOpCertStore.h>
 #include <crypto/DefaultSessionKeystore.h>
 #include <crypto/OperationalKeystore.h>
-#if CHIP_CRYPTO_PSA
-#include <crypto/PSAOperationalKeystore.h>
-#else
 #include <crypto/PersistentStorageOperationalKeystore.h>
-#endif
 #include <inet/InetConfig.h>
 #include <lib/core/CHIPConfig.h>
 #include <lib/support/SafeInt.h>
@@ -218,14 +214,10 @@ struct CommonCaseDeviceServerInitParams : public ServerInitParams
         // PersistentStorageDelegate "software-based" operational key access injection
         if (this->operationalKeystore == nullptr)
         {
-#if CHIP_CRYPTO_PSA
-            this->operationalKeystore = &sPSAOperationalKeystore;
-#else
             // WARNING: PersistentStorageOperationalKeystore::Finish() is never called. It's fine for
             //          for examples and for now.
             ReturnErrorOnFailure(sPersistentStorageOperationalKeystore.Init(this->persistentStorageDelegate));
             this->operationalKeystore = &sPersistentStorageOperationalKeystore;
-#endif
         }
 
         // OpCertStore can be injected but default to persistent storage default
@@ -281,11 +273,7 @@ struct CommonCaseDeviceServerInitParams : public ServerInitParams
 
 private:
     static KvsPersistentStorageDelegate sKvsPersistenStorageDelegate;
-#if CHIP_CRYPTO_PSA
-    static PSAOperationalKeystore sPSAOperationalKeystore;
-#else
     static PersistentStorageOperationalKeystore sPersistentStorageOperationalKeystore;
-#endif
     static Credentials::PersistentStorageOpCertStore sPersistentStorageOpCertStore;
     static Credentials::GroupDataProviderImpl sGroupDataProvider;
     static chip::app::DefaultTimerDelegate sTimerDelegate;