diff --git a/src/Socket/socket.ts b/src/Socket/socket.ts
index 34b546a..69c3581 100644
--- a/src/Socket/socket.ts
+++ b/src/Socket/socket.ts
@@ -533,8 +533,12 @@ export const makeSocket = ({
 	})
 
 	process.nextTick(() => {
-		// start buffering important events
-		ev.buffer()
+		if(creds.me?.id) {
+			// start buffering important events
+			// if we're logged in
+			ev.buffer()
+		}
+
 		ev.emit('connection.update', { connection: 'connecting', receivedPendingNotifications: false, qr: undefined })
 	})
 	// update credentials when required