diff --git a/include/wsrep/client_state.hpp b/include/wsrep/client_state.hpp
index fd68eb1..7d4eaf4 100644
--- a/include/wsrep/client_state.hpp
+++ b/include/wsrep/client_state.hpp
@@ -601,6 +601,8 @@ namespace wsrep
          */
         void xa_detach()
         {
+            assert(mode_ == m_local);
+            assert(state_ == s_none || state_ == s_exec);
             transaction_.xa_detach();
         }
 
diff --git a/src/transaction.cpp b/src/transaction.cpp
index d02f5f2..b3af8a1 100644
--- a/src/transaction.cpp
+++ b/src/transaction.cpp
@@ -484,7 +484,6 @@ int wsrep::transaction::before_commit()
 
         if (ret == 0 && state() == s_prepared)
         {
-            assert(state() == s_prepared);
             ret = certify_commit(lock);
             assert((ret == 0 && state() == s_committing) ||
                    (state() == s_must_abort ||