diff --git a/scripts/open_database.py b/scripts/open_database.py
index 26634ff56e..8d05abe8b9 100644
--- a/scripts/open_database.py
+++ b/scripts/open_database.py
@@ -1,5 +1,7 @@
 import sys, os, re
 import sqlcipher3
+import readline
+
 from getpass import getpass
 from common import PasswordFunctions
 
diff --git a/src/app/core/fleets/fleet_configuration.nim b/src/app/core/fleets/fleet_configuration.nim
index 90781f5fe8..05f26c0db3 100644
--- a/src/app/core/fleets/fleet_configuration.nim
+++ b/src/app/core/fleets/fleet_configuration.nim
@@ -1,4 +1,4 @@
-import json, typetraits, tables, sequtils
+import json, typetraits, tables, sequtils, strutils
 
 type
   Fleet* {.pure.} = enum
@@ -76,3 +76,9 @@ proc getMailservers*(self: FleetConfiguration, fleet: Fleet): Table[string, stri
     result = initTable[string,string]()
     return
   result = self.fleet[$fleet][fleetKey]
+
+proc fleetFromString*(fleet: string): Fleet {.inline.} =
+  try:
+    return parseEnum[Fleet](fleet)
+  except:
+    return Fleet.Undefined
diff --git a/src/app/modules/main/profile_section/advanced/controller.nim b/src/app/modules/main/profile_section/advanced/controller.nim
index 130ef6392c..bc17b7e714 100644
--- a/src/app/modules/main/profile_section/advanced/controller.nim
+++ b/src/app/modules/main/profile_section/advanced/controller.nim
@@ -35,7 +35,7 @@ proc init*(self: Controller) =
   discard
 
 proc getFleet*(self: Controller): string =
-  self.nodeConfigurationService.getFleetAsString()
+  return self.nodeConfigurationService.getFleetAsString()
 
 proc changeFleetTo*(self: Controller, fleet: string) =
   if (not self.nodeConfigurationService.setFleet(fleet)):
diff --git a/src/app_service/service/node_configuration/service.nim b/src/app_service/service/node_configuration/service.nim
index 8b5f3025dc..f46d4b86c7 100644
--- a/src/app_service/service/node_configuration/service.nim
+++ b/src/app_service/service/node_configuration/service.nim
@@ -129,7 +129,7 @@ proc getFleet*(self: Service): Fleet =
   result = self.settingsService.getFleet()
   if result == Fleet.Undefined:
     let fleetFromNodeConfig = self.configuration.ClusterConfig.Fleet
-    result = parseEnum[Fleet](fleetFromNodeConfig)
+    result = fleetFromString(fleetFromNodeConfig)
 
 proc getFleetAsString*(self: Service): string =
   result = $self.getFleet()
@@ -148,7 +148,7 @@ proc setFleet*(self: Service, fleet: string): bool =
     error "error saving fleet ", procName="setFleet"
     return false
   
-  let fleetType = parseEnum[Fleet](fleet)
+  let fleetType = fleetFromString(fleet)
   var newConfiguration = self.configuration
   newConfiguration.ClusterConfig.Fleet = fleet
   newConfiguration.ClusterConfig.BootNodes = self.fleetConfiguration.getNodes(fleetType, FleetNodes.Bootnodes)
diff --git a/src/app_service/service/settings/service.nim b/src/app_service/service/settings/service.nim
index f61e68f2ab..b9f41c535c 100644
--- a/src/app_service/service/settings/service.nim
+++ b/src/app_service/service/settings/service.nim
@@ -18,7 +18,7 @@ export stickers_dto
 # Default values:
 const DEFAULT_CURRENCY* = "USD"
 const DEFAULT_TELEMETRY_SERVER_URL* = "https://telemetry.status.im"
-const DEFAULT_FLEET* = $Fleet.ShardsTest
+const DEFAULT_FLEET* = Fleet.ShardsTest
 
 # Signals:
 const SIGNAL_CURRENCY_UPDATED* = "currencyUpdated"
@@ -398,7 +398,7 @@ QtObject:
 
   proc getFleet*(self: Service): Fleet =
     let fleetAsString = self.getFleetAsString()
-    return parseEnum[Fleet](fleetAsString)
+    return fleetFromString(fleetAsString)
 
   proc getCurrentUserStatus*(self: Service): CurrentUserStatus =
     self.settings.currentUserStatus
@@ -413,6 +413,8 @@ QtObject:
     return ""
 
   proc pinMailserver*(self: Service, mailserverID: string, fleet: Fleet): bool =
+    if fleet == Fleet.Undefined:
+      return false
     var newMailserverJsonObj = self.settings.pinnedMailserver.pinnedMailserverToJsonNode()
     newMailserverJsonObj[$fleet] = %* mailserverID
     if(self.saveSetting(KEY_PINNED_MAILSERVERS, newMailserverJsonObj)):
diff --git a/vendor/status-go b/vendor/status-go
index ba7faea027..23ee898754 160000
--- a/vendor/status-go
+++ b/vendor/status-go
@@ -1 +1 @@
-Subproject commit ba7faea027b1e87e6d53b0e487df2469cd6271f2
+Subproject commit 23ee898754f71341dc53e71657ef0633165f7bd3