diff --git a/substrate/client/transaction-pool/src/fork_aware_txpool/fork_aware_txpool.rs b/substrate/client/transaction-pool/src/fork_aware_txpool/fork_aware_txpool.rs
index beb41662353c72cfe565ba7564f4e16f1806bc24..2adfef5c90e09e350d751310b33b49c10b65a7f0 100644
--- a/substrate/client/transaction-pool/src/fork_aware_txpool/fork_aware_txpool.rs
+++ b/substrate/client/transaction-pool/src/fork_aware_txpool/fork_aware_txpool.rs
@@ -839,7 +839,12 @@ where
 	) -> Result<Self::Hash, Self::Error> {
 		//todo [#5493]
 		//looks like view_store / view needs non async submit_local method ?.
-		unimplemented!();
+		let e = Err(sc_transaction_pool_api::error::Error::Unactionable.into());
+		log::warn!(
+			target: LOG_TARGET,
+			"LocalTransactionPool::submit_local is not implemented for ForkAwareTxPool, returning error: {e:?}",
+		);
+		e
 	}
 }
 
diff --git a/substrate/client/transaction-pool/src/fork_aware_txpool/multi_view_listener.rs b/substrate/client/transaction-pool/src/fork_aware_txpool/multi_view_listener.rs
index 789931d02b8a29b72b5d3a273e375a9f44a21ed4..4582eff8481e25176b50249ef68d46fb104badbe 100644
--- a/substrate/client/transaction-pool/src/fork_aware_txpool/multi_view_listener.rs
+++ b/substrate/client/transaction-pool/src/fork_aware_txpool/multi_view_listener.rs
@@ -214,11 +214,7 @@ where
 				} else {
 					Some(status)
 				},
-			TransactionStatus::Retracted(_) => {
-				//todo remove panic / handle event [#5479]
-				panic!("retracted? shall not happen");
-				// false
-			},
+			TransactionStatus::Retracted(_) => None,
 			TransactionStatus::FinalityTimeout(_) => Some(status),
 			TransactionStatus::Finalized(_) => {
 				self.terminate = true;