diff --git a/rpc/chain/rpc_limiter.go b/rpc/chain/rpc_limiter.go
index 3e56de5cd..a6d9846d4 100644
--- a/rpc/chain/rpc_limiter.go
+++ b/rpc/chain/rpc_limiter.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/google/uuid"
+
 	"github.com/status-im/status-go/common"
 
 	"github.com/ethereum/go-ethereum/log"
diff --git a/rtt/rtt.go b/rtt/rtt.go
index 4fd30548c..da9c08986 100644
--- a/rtt/rtt.go
+++ b/rtt/rtt.go
@@ -6,8 +6,9 @@ import (
 	"time"
 
 	errors "github.com/pkg/errors"
-	"github.com/status-im/status-go/common"
 	tcp "github.com/status-im/tcp-shaker"
+
+	"github.com/status-im/status-go/common"
 )
 
 type Result struct {
diff --git a/server/pairing/peers/udp_notifier.go b/server/pairing/peers/udp_notifier.go
index 1be9b5816..8afff84ef 100644
--- a/server/pairing/peers/udp_notifier.go
+++ b/server/pairing/peers/udp_notifier.go
@@ -7,8 +7,9 @@ import (
 
 	"github.com/golang/protobuf/proto"
 	udpp2p "github.com/schollz/peerdiscovery"
-	"github.com/status-im/status-go/common"
 	"go.uber.org/zap"
+
+	"github.com/status-im/status-go/common"
 )
 
 const (
diff --git a/services/wallet/async/scheduler.go b/services/wallet/async/scheduler.go
index d456b7475..81c7e37c8 100644
--- a/services/wallet/async/scheduler.go
+++ b/services/wallet/async/scheduler.go
@@ -6,8 +6,9 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/status-im/status-go/common"
 	orderedmap "github.com/wk8/go-ordered-map/v2"
+
+	"github.com/status-im/status-go/common"
 )
 
 var ErrTaskOverwritten = errors.New("task overwritten")
diff --git a/timesource/timesource.go b/timesource/timesource.go
index f80797ed1..97a9147ec 100644
--- a/timesource/timesource.go
+++ b/timesource/timesource.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/beevik/ntp"
+
 	"github.com/status-im/status-go/common"
 
 	"github.com/ethereum/go-ethereum/log"
diff --git a/waku/common/rate_limiter.go b/waku/common/rate_limiter.go
index 375bdce47..f674c77d2 100644
--- a/waku/common/rate_limiter.go
+++ b/waku/common/rate_limiter.go
@@ -25,9 +25,10 @@ import (
 	"net"
 	"time"
 
-	"github.com/status-im/status-go/common"
 	"github.com/tsenart/tb"
 
+	"github.com/status-im/status-go/common"
+
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/p2p/enode"
 )