diff --git a/src/GrampsDb/_GrampsBSDDB.py b/src/GrampsDb/_GrampsBSDDB.py
index bde5ac084..3a0ac4f5d 100644
--- a/src/GrampsDb/_GrampsBSDDB.py
+++ b/src/GrampsDb/_GrampsBSDDB.py
@@ -1066,6 +1066,8 @@ class GrampsBSDDB(GrampsDbBase):
             # A batch transaction does not store the commits
             # Aborting the session completely will become impossible.
             self.abort_possible = False
+            # Undo is also impossible after batch transaction
+            self.undoindex = -1
         transaction = BdbTransaction(msg,self.undodb,batch,no_magic)
         if transaction.batch:
             if self.UseTXN:
diff --git a/src/GrampsDb/_GrampsDbBase.py b/src/GrampsDb/_GrampsDbBase.py
index eea50fe46..5c9af1964 100644
--- a/src/GrampsDb/_GrampsDbBase.py
+++ b/src/GrampsDb/_GrampsDbBase.py
@@ -1208,6 +1208,8 @@ class GrampsDbBase(GrampsDBCallback):
             # A batch transaction does not store the commits
             # Aborting the session completely will become impossible.
             self.abort_possible = False
+            # Undo is also impossible after batch transaction
+            self.undoindex = -1
         return Transaction(msg, self.undodb, batch)
 
     def transaction_commit(self, transaction, msg):