diff --git a/discovery/discovery.go b/discovery/discovery.go
index 9117d49dc0..bb62a0c4dc 100644
--- a/discovery/discovery.go
+++ b/discovery/discovery.go
@@ -101,11 +101,11 @@ func (d *Discovery) stopLoop() {
 	log.Info(logPrefix, "stopping discovery loop..")
 	d.RLock()
 	if d.status == WaitingForRegistration {
+		d.RUnlock()
 		d.unsubscribe()
+		d.RLock()
 	}
-	d.RUnlock()
 
-	d.RLock()
 	if d.status == RegisterProposal || d.status == PingProposal {
 		d.RUnlock()
 		d.changeStatus(UnregisterProposal)
diff --git a/discovery/discovery_fake.go b/discovery/discovery_fake.go
index 9bc8c300fa..a6ad2bc8d8 100644
--- a/discovery/discovery_fake.go
+++ b/discovery/discovery_fake.go
@@ -25,8 +25,8 @@ import (
 	"github.com/mysteriumnetwork/node/server"
 )
 
-// NewFakeDiscrovery creates fake discovery structure
-func NewFakeDiscrovery() *Discovery {
+// NewFakeDiscovery creates fake discovery structure
+func NewFakeDiscovery() *Discovery {
 	return &Discovery{
 		statusChan:                  make(chan Status),
 		proposalAnnouncementStopped: &sync.WaitGroup{},
diff --git a/discovery/discovery_test.go b/discovery/discovery_test.go
index 393986cfdd..aaacb5a143 100644
--- a/discovery/discovery_test.go
+++ b/discovery/discovery_test.go
@@ -35,7 +35,7 @@ var (
 )
 
 func TestStartRegistersProposal(t *testing.T) {
-	d := NewFakeDiscrovery()
+	d := NewFakeDiscovery()
 	d.identityRegistry = &identity_registry.FakeRegistry{RegistrationEventExists: false, Registered: true}
 
 	d.Start(providerID, proposal)
@@ -45,7 +45,7 @@ func TestStartRegistersProposal(t *testing.T) {
 }
 
 func TestStartRegistersIdentitySuccessfully(t *testing.T) {
-	d := NewFakeDiscrovery()
+	d := NewFakeDiscovery()
 	d.identityRegistry = &identity_registry.FakeRegistry{RegistrationEventExists: true, Registered: false}
 
 	d.Start(providerID, proposal)
@@ -55,7 +55,7 @@ func TestStartRegistersIdentitySuccessfully(t *testing.T) {
 }
 
 func TestStartRegisterIdentityCancelled(t *testing.T) {
-	d := NewFakeDiscrovery()
+	d := NewFakeDiscovery()
 	d.identityRegistry = &identity_registry.FakeRegistry{RegistrationEventExists: false, Registered: false}
 
 	d.Start(providerID, proposal)
@@ -70,7 +70,7 @@ func TestStartRegisterIdentityCancelled(t *testing.T) {
 }
 
 func TestStartStopUnregisterProposal(t *testing.T) {
-	d := NewFakeDiscrovery()
+	d := NewFakeDiscovery()
 	d.identityRegistry = &identity_registry.FakeRegistry{RegistrationEventExists: false, Registered: true}
 
 	d.Start(providerID, proposal)
@@ -91,7 +91,7 @@ func observeStatus(d *Discovery, status Status) Status {
 			d.RUnlock()
 			return d.status
 		}
-		time.Sleep(10 * time.Millisecond)
 		d.RUnlock()
+		time.Sleep(10 * time.Millisecond)
 	}
 }
diff --git a/discovery/factory.go b/discovery/factory.go
index fea0e7c5cd..f7223b083d 100644
--- a/discovery/factory.go
+++ b/discovery/factory.go
@@ -52,12 +52,12 @@ func NewService(
 	signerCreate identity.SignerFactory,
 ) *Discovery {
 	return &Discovery{
-		identityRegistry:     identityRegistry,
-		identityRegistration: identityRegistration,
-		mysteriumClient:      mysteriumClient,
-		signerCreate:         signerCreate,
-		statusChan:           make(chan Status),
-		status:               StatusUndefined,
+		identityRegistry:            identityRegistry,
+		identityRegistration:        identityRegistration,
+		mysteriumClient:             mysteriumClient,
+		signerCreate:                signerCreate,
+		statusChan:                  make(chan Status),
+		status:                      StatusUndefined,
 		proposalAnnouncementStopped: &sync.WaitGroup{},
 		unsubscribe:                 func() {},
 		stop:                        func() {},