diff --git a/libraries/chain/db_management.cpp b/libraries/chain/db_management.cpp
index e166d13e..3ec802c3 100644
--- a/libraries/chain/db_management.cpp
+++ b/libraries/chain/db_management.cpp
@@ -196,6 +196,11 @@ void database::close(uint32_t blocks_to_rewind)
    {
    }
 
+   // Since pop_block() will move tx's in the popped blocks into pending,
+   // we have to clear_pending() after we're done popping to get a clean
+   // DB state (issue #336).
+   clear_pending();
+
    object_database::flush();
    object_database::close();