diff --git a/account/generator/generator.go b/account/generator/generator.go
index e62aa6462..9060bb23c 100644
--- a/account/generator/generator.go
+++ b/account/generator/generator.go
@@ -9,9 +9,8 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-
 	"github.com/status-im/status-go/eth-node/crypto"
+	"github.com/status-im/status-go/eth-node/keystore"
 	"github.com/status-im/status-go/eth-node/types"
 	"github.com/status-im/status-go/extkeys"
 )
diff --git a/lib/response.go b/lib/response.go
index 2476d40ed..6aff74f21 100644
--- a/lib/response.go
+++ b/lib/response.go
@@ -3,9 +3,8 @@ package main
 import (
 	"encoding/json"
 
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-
 	"github.com/status-im/status-go/account"
+	"github.com/status-im/status-go/eth-node/keystore"
 	"github.com/status-im/status-go/transactions"
 )
 
diff --git a/mobile/response.go b/mobile/response.go
index 8f00c39cb..0ad05a610 100644
--- a/mobile/response.go
+++ b/mobile/response.go
@@ -3,9 +3,8 @@ package statusgo
 import (
 	"encoding/json"
 
-	"github.com/ethereum/go-ethereum/accounts/keystore"
-
 	"github.com/status-im/status-go/account"
+	"github.com/status-im/status-go/eth-node/keystore"
 	"github.com/status-im/status-go/transactions"
 )