diff --git a/substrate/frame/executive/src/tests.rs b/substrate/frame/executive/src/tests.rs
index b6ed708d7c214..9584580b5eb99 100644
--- a/substrate/frame/executive/src/tests.rs
+++ b/substrate/frame/executive/src/tests.rs
@@ -49,7 +49,7 @@ mod try_runtime {
 	use frame_support::traits::{IdentifiableTryStateLogic, TryStateLogic};
 	use sp_runtime::traits::AtLeast32BitUnsigned;
 
-	// Will contain `true` when the custom runtime logic was called.
+	// Will contain `true` when the custom runtime logic is called.
 	pub(super) static mut CANARY_FLAG: bool = false;
 
 	const CUSTOM_TRY_STATE_ID: &[u8] = b"custom_try_state";
diff --git a/substrate/frame/support/procedural/src/pallet/expand/hooks.rs b/substrate/frame/support/procedural/src/pallet/expand/hooks.rs
index 3623b595268d0..19d6f8caf146c 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/hooks.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/hooks.rs
@@ -18,6 +18,7 @@
 use crate::pallet::Def;
 
 /// * implement the individual traits using the Hooks trait
+/// * implement the `TryStateLogic` and `IdentifiableTryStateLogic` traits, that are strictly dependent on the `TryState` hook
 pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 	let (where_clause, span, has_runtime_upgrade) = match def.hooks.as_ref() {
 		Some(hooks) => {
@@ -141,200 +142,222 @@ pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
 	};
 
 	quote::quote_spanned!(span =>
-		#hooks_impl
-
-		impl<#type_impl_gen>
-			#frame_support::traits::OnFinalize<#frame_system::pallet_prelude::BlockNumberFor::<T>>
-			for #pallet_ident<#type_use_gen> #where_clause
-		{
-			fn on_finalize(n: #frame_system::pallet_prelude::BlockNumberFor::<T>) {
-				#frame_support::__private::sp_tracing::enter_span!(
-					#frame_support::__private::sp_tracing::trace_span!("on_finalize")
-				);
-				<
-					Self as #frame_support::traits::Hooks<
-						#frame_system::pallet_prelude::BlockNumberFor::<T>
-					>
-				>::on_finalize(n)
+			#hooks_impl
+
+			impl<#type_impl_gen>
+				#frame_support::traits::OnFinalize<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+				for #pallet_ident<#type_use_gen> #where_clause
+			{
+				fn on_finalize(n: #frame_system::pallet_prelude::BlockNumberFor::<T>) {
+					#frame_support::__private::sp_tracing::enter_span!(
+						#frame_support::__private::sp_tracing::trace_span!("on_finalize")
+					);
+					<
+						Self as #frame_support::traits::Hooks<
+							#frame_system::pallet_prelude::BlockNumberFor::<T>
+						>
+					>::on_finalize(n)
+				}
 			}
-		}
 
-		impl<#type_impl_gen>
-			#frame_support::traits::OnIdle<#frame_system::pallet_prelude::BlockNumberFor::<T>>
-			for #pallet_ident<#type_use_gen> #where_clause
-		{
-			fn on_idle(
-				n: #frame_system::pallet_prelude::BlockNumberFor::<T>,
-				remaining_weight: #frame_support::weights::Weight
-			) -> #frame_support::weights::Weight {
-				<
-					Self as #frame_support::traits::Hooks<
-						#frame_system::pallet_prelude::BlockNumberFor::<T>
-					>
-				>::on_idle(n, remaining_weight)
+			impl<#type_impl_gen>
+				#frame_support::traits::OnIdle<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+				for #pallet_ident<#type_use_gen> #where_clause
+			{
+				fn on_idle(
+					n: #frame_system::pallet_prelude::BlockNumberFor::<T>,
+					remaining_weight: #frame_support::weights::Weight
+				) -> #frame_support::weights::Weight {
+					<
+						Self as #frame_support::traits::Hooks<
+							#frame_system::pallet_prelude::BlockNumberFor::<T>
+						>
+					>::on_idle(n, remaining_weight)
+				}
 			}
-		}
 
-		impl<#type_impl_gen>
-			#frame_support::traits::OnPoll<#frame_system::pallet_prelude::BlockNumberFor::<T>>
-			for #pallet_ident<#type_use_gen> #where_clause
-		{
-			fn on_poll(
-				n: #frame_system::pallet_prelude::BlockNumberFor::<T>,
-				weight: &mut #frame_support::weights::WeightMeter
-			) {
-				<
-					Self as #frame_support::traits::Hooks<
-						#frame_system::pallet_prelude::BlockNumberFor::<T>
-					>
-				>::on_poll(n, weight);
+			impl<#type_impl_gen>
+				#frame_support::traits::OnPoll<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+				for #pallet_ident<#type_use_gen> #where_clause
+			{
+				fn on_poll(
+					n: #frame_system::pallet_prelude::BlockNumberFor::<T>,
+					weight: &mut #frame_support::weights::WeightMeter
+				) {
+					<
+						Self as #frame_support::traits::Hooks<
+							#frame_system::pallet_prelude::BlockNumberFor::<T>
+						>
+					>::on_poll(n, weight);
+				}
 			}
-		}
 
-		impl<#type_impl_gen>
-			#frame_support::traits::OnInitialize<#frame_system::pallet_prelude::BlockNumberFor::<T>>
-			for #pallet_ident<#type_use_gen> #where_clause
-		{
-			fn on_initialize(
-				n: #frame_system::pallet_prelude::BlockNumberFor::<T>
-			) -> #frame_support::weights::Weight {
-				#frame_support::__private::sp_tracing::enter_span!(
-					#frame_support::__private::sp_tracing::trace_span!("on_initialize")
-				);
-				<
-					Self as #frame_support::traits::Hooks<
-						#frame_system::pallet_prelude::BlockNumberFor::<T>
-					>
-				>::on_initialize(n)
+			impl<#type_impl_gen>
+				#frame_support::traits::OnInitialize<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+				for #pallet_ident<#type_use_gen> #where_clause
+			{
+				fn on_initialize(
+					n: #frame_system::pallet_prelude::BlockNumberFor::<T>
+				) -> #frame_support::weights::Weight {
+					#frame_support::__private::sp_tracing::enter_span!(
+						#frame_support::__private::sp_tracing::trace_span!("on_initialize")
+					);
+					<
+						Self as #frame_support::traits::Hooks<
+							#frame_system::pallet_prelude::BlockNumberFor::<T>
+						>
+					>::on_initialize(n)
+				}
 			}
-		}
 
-		impl<#type_impl_gen>
-			#frame_support::traits::BeforeAllRuntimeMigrations
-			for #pallet_ident<#type_use_gen> #where_clause
-		{
-			fn before_all_runtime_migrations() -> #frame_support::weights::Weight {
-				use #frame_support::traits::{Get, PalletInfoAccess};
-				use #frame_support::__private::hashing::twox_128;
-				use #frame_support::storage::unhashed::contains_prefixed_key;
-				#frame_support::__private::sp_tracing::enter_span!(
-					#frame_support::__private::sp_tracing::trace_span!("before_all")
-				);
+			impl<#type_impl_gen>
+				#frame_support::traits::BeforeAllRuntimeMigrations
+				for #pallet_ident<#type_use_gen> #where_clause
+			{
+				fn before_all_runtime_migrations() -> #frame_support::weights::Weight {
+					use #frame_support::traits::{Get, PalletInfoAccess};
+					use #frame_support::__private::hashing::twox_128;
+					use #frame_support::storage::unhashed::contains_prefixed_key;
+					#frame_support::__private::sp_tracing::enter_span!(
+						#frame_support::__private::sp_tracing::trace_span!("before_all")
+					);
 
-				// Check if the pallet has any keys set, including the storage version. If there are
-				// no keys set, the pallet was just added to the runtime and needs to have its
-				// version initialized.
-				let pallet_hashed_prefix = <Self as PalletInfoAccess>::name_hash();
-				let exists = contains_prefixed_key(&pallet_hashed_prefix);
-				if !exists {
-					#initialize_on_chain_storage_version
-					<T as #frame_system::Config>::DbWeight::get().reads_writes(1, 1)
-				} else {
-					<T as #frame_system::Config>::DbWeight::get().reads(1)
+					// Check if the pallet has any keys set, including the storage version. If there are
+					// no keys set, the pallet was just added to the runtime and needs to have its
+					// version initialized.
+					let pallet_hashed_prefix = <Self as PalletInfoAccess>::name_hash();
+					let exists = contains_prefixed_key(&pallet_hashed_prefix);
+					if !exists {
+						#initialize_on_chain_storage_version
+						<T as #frame_system::Config>::DbWeight::get().reads_writes(1, 1)
+					} else {
+						<T as #frame_system::Config>::DbWeight::get().reads(1)
+					}
 				}
 			}
-		}
 
-		impl<#type_impl_gen>
-			#frame_support::traits::OnRuntimeUpgrade
-			for #pallet_ident<#type_use_gen> #where_clause
-		{
-			fn on_runtime_upgrade() -> #frame_support::weights::Weight {
-				#frame_support::__private::sp_tracing::enter_span!(
-					#frame_support::__private::sp_tracing::trace_span!("on_runtime_update")
-				);
+			impl<#type_impl_gen>
+				#frame_support::traits::OnRuntimeUpgrade
+				for #pallet_ident<#type_use_gen> #where_clause
+			{
+				fn on_runtime_upgrade() -> #frame_support::weights::Weight {
+					#frame_support::__private::sp_tracing::enter_span!(
+						#frame_support::__private::sp_tracing::trace_span!("on_runtime_update")
+					);
 
-				// log info about the upgrade.
-				#log_runtime_upgrade
+					// log info about the upgrade.
+					#log_runtime_upgrade
 
-				<
-					Self as #frame_support::traits::Hooks<
-						#frame_system::pallet_prelude::BlockNumberFor::<T>
-					>
-				>::on_runtime_upgrade()
-			}
+					<
+						Self as #frame_support::traits::Hooks<
+							#frame_system::pallet_prelude::BlockNumberFor::<T>
+						>
+					>::on_runtime_upgrade()
+				}
 
-			#[cfg(feature = "try-runtime")]
-			fn pre_upgrade() -> Result<#frame_support::__private::sp_std::vec::Vec<u8>, #frame_support::sp_runtime::TryRuntimeError> {
-				<
-					Self
-					as
-					#frame_support::traits::Hooks<#frame_system::pallet_prelude::BlockNumberFor::<T>>
-				>::pre_upgrade()
-			}
+				#[cfg(feature = "try-runtime")]
+				fn pre_upgrade() -> Result<#frame_support::__private::sp_std::vec::Vec<u8>, #frame_support::sp_runtime::TryRuntimeError> {
+					<
+						Self
+						as
+						#frame_support::traits::Hooks<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+					>::pre_upgrade()
+				}
 
-			#[cfg(feature = "try-runtime")]
-			fn post_upgrade(state: #frame_support::__private::sp_std::vec::Vec<u8>) -> Result<(), #frame_support::sp_runtime::TryRuntimeError> {
-				#post_storage_version_check
-
-				<
-					Self
-					as
-					#frame_support::traits::Hooks<#frame_system::pallet_prelude::BlockNumberFor::<T>>
-				>::post_upgrade(state)
-			}
-		}
+				#[cfg(feature = "try-runtime")]
+				fn post_upgrade(state: #frame_support::__private::sp_std::vec::Vec<u8>) -> Result<(), #frame_support::sp_runtime::TryRuntimeError> {
+					#post_storage_version_check
 
-		impl<#type_impl_gen>
-			#frame_support::traits::OffchainWorker<#frame_system::pallet_prelude::BlockNumberFor::<T>>
-			for #pallet_ident<#type_use_gen> #where_clause
-		{
-			fn offchain_worker(n: #frame_system::pallet_prelude::BlockNumberFor::<T>) {
-				<
-					Self as #frame_support::traits::Hooks<
-						#frame_system::pallet_prelude::BlockNumberFor::<T>
-					>
-				>::offchain_worker(n)
+					<
+						Self
+						as
+						#frame_support::traits::Hooks<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+					>::post_upgrade(state)
+				}
 			}
-		}
 
-		// Integrity tests are only required for when `std` is enabled.
-		#frame_support::std_enabled! {
 			impl<#type_impl_gen>
-				#frame_support::traits::IntegrityTest
-			for #pallet_ident<#type_use_gen> #where_clause
+				#frame_support::traits::OffchainWorker<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+				for #pallet_ident<#type_use_gen> #where_clause
 			{
-				fn integrity_test() {
-					#frame_support::__private::sp_io::TestExternalities::default().execute_with(|| {
-						<
-							Self as #frame_support::traits::Hooks<
-								#frame_system::pallet_prelude::BlockNumberFor::<T>
-							>
-						>::integrity_test()
-					});
+				fn offchain_worker(n: #frame_system::pallet_prelude::BlockNumberFor::<T>) {
+					<
+						Self as #frame_support::traits::Hooks<
+							#frame_system::pallet_prelude::BlockNumberFor::<T>
+						>
+					>::offchain_worker(n)
 				}
 			}
-		}
 
-		#[cfg(feature = "try-runtime")]
-		impl<#type_impl_gen>
-			#frame_support::traits::TryState<#frame_system::pallet_prelude::BlockNumberFor::<T>>
-			for #pallet_ident<#type_use_gen> #where_clause
-		{
-			fn try_state(
-				n: #frame_system::pallet_prelude::BlockNumberFor::<T>,
-				_s: #frame_support::traits::TryStateSelect
-			) -> Result<(), #frame_support::sp_runtime::TryRuntimeError> {
-				#frame_support::__private::log::info!(
-					target: #frame_support::LOG_TARGET,
-					"🩺 Running {:?} try-state checks",
-					#pallet_name,
-				);
-				<
-					Self as #frame_support::traits::Hooks<
-						#frame_system::pallet_prelude::BlockNumberFor::<T>
-					>
-				>::try_state(n).map_err(|err| {
-					#frame_support::__private::log::error!(
+			// Integrity tests are only required for when `std` is enabled.
+			#frame_support::std_enabled! {
+				impl<#type_impl_gen>
+					#frame_support::traits::IntegrityTest
+				for #pallet_ident<#type_use_gen> #where_clause
+				{
+					fn integrity_test() {
+						#frame_support::__private::sp_io::TestExternalities::default().execute_with(|| {
+							<
+								Self as #frame_support::traits::Hooks<
+									#frame_system::pallet_prelude::BlockNumberFor::<T>
+								>
+							>::integrity_test()
+						});
+					}
+				}
+			}
+
+			#[cfg(feature = "try-runtime")]
+			impl<#type_impl_gen>
+				#frame_support::traits::TryState<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+				for #pallet_ident<#type_use_gen> #where_clause
+			{
+				fn try_state(
+					n: #frame_system::pallet_prelude::BlockNumberFor::<T>,
+					_s: #frame_support::traits::TryStateSelect
+				) -> Result<(), #frame_support::sp_runtime::TryRuntimeError> {
+					#frame_support::__private::log::info!(
 						target: #frame_support::LOG_TARGET,
-						"❌ {:?} try_state checks failed: {:?}",
+						"🩺 Running {:?} try-state checks",
 						#pallet_name,
-						err
 					);
+					<
+						Self as #frame_support::traits::Hooks<
+							#frame_system::pallet_prelude::BlockNumberFor::<T>
+						>
+					>::try_state(n).map_err(|err| {
+						#frame_support::__private::log::error!(
+							target: #frame_support::LOG_TARGET,
+							"❌ {:?} try_state checks failed: {:?}",
+							#pallet_name,
+							err
+						);
 
-					err
-				})
+						err
+					})
+				}
+			}
+
+			// Implement `TryStateLogic<BlockNumber>` for `Pallet`
+			#[cfg(feature = "try-runtime")]
+			impl<#type_impl_gen> #frame_support::traits::TryStateLogic<#frame_system::pallet_prelude::BlockNumberFor<T>>
+				for #pallet_ident<#type_use_gen>
+				#where_clause
+			{
+				fn try_state(n: frame_system::pallet_prelude::BlockNumberFor<T>) -> Result<(), #frame_support::sp_runtime::TryRuntimeError> {
+					<Self as #frame_support::traits::TryState<#frame_system::pallet_prelude::BlockNumberFor::<T>>>::try_state(n, #frame_support::traits::TryStateSelect::All)
+				}
+			}
+
+			// Implement `IdentifiableTryStateLogic<BlockNumber>` for `Pallet`
+			#[cfg(feature = "try-runtime")]
+			impl<#type_impl_gen> #frame_support::traits::IdentifiableTryStateLogic<frame_system::pallet_prelude::BlockNumberFor<T>>
+				for #pallet_ident<#type_use_gen>
+				#where_clause
+			{
+				fn matches_id(id: &[u8]) -> bool {
+					<Self as #frame_support::pallet_prelude::PalletInfoAccess>::name().as_bytes() == id
+				}
 			}
-		}
 	)
 }
diff --git a/substrate/frame/support/procedural/src/pallet/expand/pallet_struct.rs b/substrate/frame/support/procedural/src/pallet/expand/pallet_struct.rs
index 640e438450a33..7cdf6bde9de87 100644
--- a/substrate/frame/support/procedural/src/pallet/expand/pallet_struct.rs
+++ b/substrate/frame/support/procedural/src/pallet/expand/pallet_struct.rs
@@ -284,28 +284,6 @@ pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
 			}
 		}
 
-		// Implement `TryStateLogic<BlockNumber>` for `Pallet`
-		#[cfg(feature = "try-runtime")]
-		impl<#type_impl_gen> #frame_support::traits::TryStateLogic<BlockNumberFor<T>>
-			for #pallet_ident<#type_use_gen>
-			#config_where_clause
-		{
-			fn try_state(n: BlockNumberFor<T>) -> Result<(), sp_runtime::TryRuntimeError> {
-				<Self as Hooks<BlockNumberFor<T>>>::try_state(n)
-			}
-		}
-
-		// Implement `IdentifiableTryStateLogic<BlockNumber>` for `Pallet`
-		#[cfg(feature = "try-runtime")]
-		impl<#type_impl_gen> #frame_support::traits::IdentifiableTryStateLogic<BlockNumberFor<T>>
-			for #pallet_ident<#type_use_gen>
-			#config_where_clause
-		{
-			fn matches_id(id: &[u8]) -> bool {
-				<Self as PalletInfoAccess>::name().as_bytes() == id
-			}
-		}
-
 		#storage_info
 		#whitelisted_storage_keys_impl
 	)
diff --git a/substrate/frame/support/src/traits/try_runtime/mod.rs b/substrate/frame/support/src/traits/try_runtime/mod.rs
index 26313f6144ac2..c5653eaafd298 100644
--- a/substrate/frame/support/src/traits/try_runtime/mod.rs
+++ b/substrate/frame/support/src/traits/try_runtime/mod.rs
@@ -295,7 +295,7 @@ where
 	}
 }
 
-// 1-element tuple calls first and then empty tuple, which is a no-op
+// 1-element tuple calls first tuple element and then empty tuple, which is a no-op
 impl<BlockNumber, T> TryState<BlockNumber> for (T,)
 where
 	BlockNumber: Clone + sp_std::fmt::Debug + AtLeast32BitUnsigned,