diff --git a/controllers/common.go b/controllers/common.go
index 64794681..bcf97f57 100644
--- a/controllers/common.go
+++ b/controllers/common.go
@@ -75,7 +75,7 @@ func GetPeersList(networkName string) ([]models.Node, error) {
 	return peers, err
 }
 
-func GetExtPeersList(networkName string, macaddress string) ([]models.ExtPeersResponse, error) {
+func GetExtPeersList(macaddress string, networkName string) ([]models.ExtPeersResponse, error) {
 
 	var peers []models.ExtPeersResponse
 	records, err := database.FetchRecords(database.EXT_CLIENT_TABLE_NAME)
diff --git a/netclient/server/grpc.go b/netclient/server/grpc.go
index 0967e2bb..5a4c1d67 100644
--- a/netclient/server/grpc.go
+++ b/netclient/server/grpc.go
@@ -1,7 +1,6 @@
 package server
 
 import (
-	"context"
 	"crypto/tls"
 	"encoding/json"
 	"log"
@@ -297,8 +296,8 @@ func GetExtPeers(macaddress string, network string, server string, dualstack boo
 		Data: macaddress + "###" + network,
 		Type: nodepb.STRING_TYPE,
 	}
-	ctx := context.Background()
-	ctx, err = auth.SetJWT(wcclient, network)
+
+	ctx, err := auth.SetJWT(wcclient, network)
 	if err != nil {
 		log.Println("Failed to authenticate.")
 		return peers, err
@@ -347,7 +346,6 @@ func GetExtPeers(macaddress string, network string, server string, dualstack boo
 			AllowedIPs:        allowedips,
 		}
 		peers = append(peers, peer)
-
 	}
 	return peers, err
 }