diff --git a/CHANGELOG.md b/CHANGELOG.md
index bfbd6dd94..c82fab154 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 Starting from v2.2.5, all notable changes to this project will be documented in this file.
 
+## v2.12.6
+
+- Fix gaps and Sample rate issue
+
 ## v2.12.5
 
 - Fix gaps in MiniSEED records
diff --git a/VERSION b/VERSION
index 8c118ca02..ea0f7e0d8 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v2.12.5
+v2.12.6
diff --git a/driver/serial/filter.go b/driver/serial/filter.go
index 7dc473b78..d5c7c2834 100644
--- a/driver/serial/filter.go
+++ b/driver/serial/filter.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 	"math"
-	"time"
 )
 
 func Filter(port io.ReadWriteCloser, signature []byte) ([]byte, error) {
@@ -19,8 +18,6 @@ func Filter(port io.ReadWriteCloser, signature []byte) ([]byte, error) {
 
 		if bytes.Equal(header, signature) {
 			return header, nil
-		} else {
-			time.Sleep(time.Millisecond)
 		}
 	}
 
diff --git a/feature/geophone/daemon.go b/feature/geophone/daemon.go
index 0bfee72ef..dbfed11aa 100644
--- a/feature/geophone/daemon.go
+++ b/feature/geophone/daemon.go
@@ -87,9 +87,8 @@ func (g *Geophone) Run(options *feature.FeatureOptions, waitGroup *sync.WaitGrou
 		for {
 			<-g.Ticker.C
 			currentTime, _ := duration.Timestamp(options.Status.System.Offset)
-			timeDiff := duration.Difference(currentTime, options.Status.LastRecvTime)
 			// Set packet timestamp, note that the timestamp in buffer is the start of the packet
-			options.Status.Buffer.TS = currentTime.UnixMilli() - timeDiff.Milliseconds()
+			options.Status.Buffer.TS = currentTime.UnixMilli() - time.Second.Milliseconds()
 			// Set last received time is the current timestamp
 			options.Status.LastRecvTime = currentTime
 			options.Status.System.Messages++