diff --git a/matrix/history.go b/matrix/history.go
index 1b99125..980b942 100644
--- a/matrix/history.go
+++ b/matrix/history.go
@@ -48,7 +48,11 @@ func NewHistoryManager(dbPath string) (*HistoryManager, error) {
 		historyEndPtr:  make(map[*rooms.Room]uint64),
 		historyLoadPtr: make(map[*rooms.Room]uint64),
 	}
-	db, err := bolt.Open(dbPath, 0600, nil)
+	db, err := bolt.Open(dbPath, 0600, &bolt.Options{
+		Timeout: 1,
+		NoGrowSync: false,
+		FreelistType: bolt.FreelistArrayType,
+	})
 	if err != nil {
 		return nil, err
 	}