diff --git a/core/state/journal.go b/core/state/journal.go
index 73218dd283c3c8249f95fe8e246052a308e30dab..b5c8ca9a219808867a13e9ff8a0b184be2a148ad 100644
--- a/core/state/journal.go
+++ b/core/state/journal.go
@@ -71,8 +71,8 @@ type (
 		hash common.Hash
 	}
 	touchChange struct {
-		account *common.Address
-		prev    bool
+		account   *common.Address
+		prev      bool
 		prevDirty bool
 	}
 )
@@ -91,6 +91,11 @@ func (ch suicideChange) undo(s *StateDB) {
 	if obj != nil {
 		obj.suicided = ch.prev
 		obj.setBalance(ch.prevbalance)
+		// if the object wasn't suicided before, remove
+		// it from the list of destructed objects as well.
+		if !obj.suicided {
+			delete(s.stateObjectsDestructed, *ch.account)
+		}
 	}
 }
 
diff --git a/core/state/statedb.go b/core/state/statedb.go
index 8e4ba21c0239d81092e32b2da33a1a881deca821..05869a0c8a54466e36561e18b5b0563193d9f73a 100644
--- a/core/state/statedb.go
+++ b/core/state/statedb.go
@@ -378,6 +378,8 @@ func (self *StateDB) Suicide(addr common.Address) bool {
 	})
 	stateObject.markSuicided()
 	stateObject.data.Balance = new(big.Int)
+	self.stateObjectsDestructed[addr] = struct{}{}
+
 	return true
 }