diff --git a/diskwriter/diskwriter.go b/diskwriter/diskwriter.go
index 9b599dd..1ea5c37 100644
--- a/diskwriter/diskwriter.go
+++ b/diskwriter/diskwriter.go
@@ -184,8 +184,8 @@ func (conn *diskConn) warn(message string) {
 // called locked
 func (conn *diskConn) reopen(extension string) error {
 	for _, t := range conn.tracks {
+		t.writeBuffered(true)
 		if t.writer != nil {
-			t.writeBuffered(true)
 			t.writer.Close()
 			t.writer = nil
 		}
@@ -207,8 +207,8 @@ func (conn *diskConn) Close() error {
 	conn.mu.Lock()
 	tracks := make([]*diskTrack, 0, len(conn.tracks))
 	for _, t := range conn.tracks {
+		t.writeBuffered(true)
 		if t.writer != nil {
-			t.writeBuffered(true)
 			t.writer.Close()
 			t.writer = nil
 		}