diff --git a/src/app/boot/app_controller.nim b/src/app/boot/app_controller.nim
index beff413d0c..b75142c3d6 100644
--- a/src/app/boot/app_controller.nim
+++ b/src/app/boot/app_controller.nim
@@ -114,7 +114,7 @@ proc newAppController*(statusFoundation: StatusFoundation): AppController =
   result.statusFoundation = statusFoundation
   
   # Preparing settings service to be exposed later as global QObject
-  result.settingsService = settings_service.newService()
+  result.settingsService = settings_service.newService(statusFoundation.events)
   result.appSettingsVariant = newQVariant(result.settingsService)
   result.notificationsManager = newNotificationsManager(statusFoundation.events, result.settingsService)
 
diff --git a/src/app/core/signals/remote_signals/messages.nim b/src/app/core/signals/remote_signals/messages.nim
index 539d722f9a..513b7b1c70 100644
--- a/src/app/core/signals/remote_signals/messages.nim
+++ b/src/app/core/signals/remote_signals/messages.nim
@@ -22,6 +22,7 @@ type MessageSignal* = ref object of Signal
   activityCenterNotifications*: seq[ActivityCenterNotificationDto]
   statusUpdates*: seq[StatusUpdateDto]
   deletedMessages*: seq[RemovedMessageDto]
+  currentStatus*: seq[StatusUpdateDto]
 
 proc fromEvent*(T: type MessageSignal, event: JsonNode): MessageSignal =
   var signal:MessageSignal = MessageSignal()
@@ -47,6 +48,10 @@ proc fromEvent*(T: type MessageSignal, event: JsonNode): MessageSignal =
       var statusUpdate = jsonStatusUpdate.toStatusUpdateDto()
       signal.statusUpdates.add(statusUpdate)
 
+  if event["event"]{"currentStatus"} != nil:
+      var currentStatus = event["event"]["currentStatus"].toStatusUpdateDto()
+      signal.currentStatus.add(currentStatus)
+
   if event["event"]{"installations"} != nil:
     for jsonDevice in event["event"]["installations"]:
       signal.devices.add(jsonDevice.toDeviceDto())
diff --git a/src/app/modules/main/controller.nim b/src/app/modules/main/controller.nim
index 047d5a9715..7db47fd224 100644
--- a/src/app/modules/main/controller.nim
+++ b/src/app/modules/main/controller.nim
@@ -203,6 +203,13 @@ proc init*(self: Controller) =
   self.events.on(SIGNAL_NETWORK_DISCONNECTED) do(e: Args):
     self.delegate.onNetworkDisconnected()
 
+  self.events.on(SIGNAL_CURRENT_USER_STATUS_UPDATED) do (e: Args):
+    var args = CurrentUserStatusArgs(e)
+    var status = true
+    if args.statusType == StatusType.Invisible:
+      status = false
+    singletonInstance.userProfile.setUserStatus(status)
+
 proc isConnected*(self: Controller): bool =
   return self.nodeService.isConnected()
 
diff --git a/src/app_service/service/settings/service.nim b/src/app_service/service/settings/service.nim
index 26315fd2a5..c150c10898 100644
--- a/src/app_service/service/settings/service.nim
+++ b/src/app_service/service/settings/service.nim
@@ -1,14 +1,15 @@
 import NimQml, chronicles, json, strutils, sequtils, tables, sugar
 
 import ../../common/[network_constants]
+import ../../../app/core/eventemitter
 import ../../../app/core/fleets/fleet_configuration
+import ../../../app/core/signals/types
 import ../../../backend/settings as status_settings
 import ../../../backend/status_update as status_update
 
 import ./dto/settings as settings_dto
 import ../contacts/dto/status_update as status_update_dto
 import ../stickers/dto/stickers as stickers_dto
-import ../../../app/core/fleets/fleet_configuration
 
 export settings_dto
 export stickers_dto
@@ -19,18 +20,27 @@ const DEFAULT_CURRENCY* = "usd"
 const DEFAULT_TELEMETRY_SERVER_URL* = "https://telemetry.status.im"
 const DEFAULT_FLEET* = $Fleet.Prod
 
+const SIGNAL_CURRENT_USER_STATUS_UPDATED* = "currentUserStatusUpdated"
+
 logScope:
   topics = "settings-service"
 
+type
+  CurrentUserStatusArgs* = ref object of Args
+    statusType*: StatusType
+    text*: string
+
 QtObject:
   type Service* = ref object of QObject
+    events: EventEmitter
     settings: SettingsDto
 
   proc delete*(self: Service) =
     self.QObject.delete
 
-  proc newService*(): Service =
+  proc newService*(events: EventEmitter): Service =
     new(result, delete)
+    result.events = events
     result.QObject.setup
 
   proc init*(self: Service) =
@@ -41,6 +51,13 @@ QtObject:
       let errDesription = e.msg
       error "error: ", errDesription
 
+    self.events.on(SignalType.Message.event) do(e: Args):
+      var receivedData = MessageSignal(e)
+      
+      if receivedData.currentStatus.len > 0:
+        var statusUpdate = receivedData.currentStatus[0]
+        self.events.emit(SIGNAL_CURRENT_USER_STATUS_UPDATED, CurrentUserStatusArgs(statusType: statusUpdate.statusType, text: statusUpdate.text))
+
   proc saveSetting(self: Service, attribute: string, value: string | JsonNode | bool | int): bool =
     try:
       let response = status_settings.saveSettings(attribute, value)
@@ -312,13 +329,20 @@ QtObject:
   proc saveSendStatusUpdates*(self: Service, value: bool): bool =
     var newStatus = StatusType.Online
     if not value:
-      newStatus = StatusType.Offline
+      # This looks unintuitive, but `StatusType.Offline` is interpreted
+      # as `StatusUpdate.UNKNOWN_STATUS_TYPE` in status-go, which causes an error.
+      # Hence `Invisible` (= 4 [which is `INACTIVE` in status-go]) is considerd offline.
+      newStatus = StatusType.Invisible
 
     try:
-      let r = status_update.setUserStatus(int(newStatus))
-      if(self.saveSetting(KEY_SEND_STATUS_UPDATES, value)):
-        self.settings.sendStatusUpdates = value
-        return true
+      # The new user status needs to always be broadcast, so we need to update
+      # the settings accordingly and might turn it off afterwards (if user has 
+      # set status to "offline"
+      if (self.saveSetting(KEY_SEND_STATUS_UPDATES, true)):
+        let r = status_update.setUserStatus(int(newStatus))
+        if(self.saveSetting(KEY_SEND_STATUS_UPDATES, value)):
+          self.settings.sendStatusUpdates = value
+          return true
       return false
     except:
       return false