diff --git a/src/main/java/it/auties/whatsapp/socket/StreamHandler.java b/src/main/java/it/auties/whatsapp/socket/StreamHandler.java
index 876a9878..a0c1e6f6 100644
--- a/src/main/java/it/auties/whatsapp/socket/StreamHandler.java
+++ b/src/main/java/it/auties/whatsapp/socket/StreamHandler.java
@@ -1071,6 +1071,9 @@ private CompletableFuture<Void> queryInitialBlockList() {
 
     private CompletableFuture<Void> updateSelfPresence() {
         if (!socketHandler.store().automaticPresenceUpdates()) {
+            if(!socketHandler.store().online()) {  // Just to be sure
+                socketHandler.sendWithNoResponse(Node.of("presence", Map.of("name", socketHandler.store().name(), "type", "unavailable")));
+            }
             return CompletableFuture.completedFuture(null);
         }