diff --git a/discord/client.py b/discord/client.py
index 3b68f39b7..757886eff 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -949,6 +949,9 @@ class Client:
 
             if activity is not None:
                 me.activities = (activity,)
+            else:
+                me.activities = ()
+
             me.status = status_enum
 
     # Guild stuff
diff --git a/discord/shard.py b/discord/shard.py
index edab0426e..e133cd0ce 100644
--- a/discord/shard.py
+++ b/discord/shard.py
@@ -348,11 +348,11 @@ class AutoShardedClient(Client):
             await shard.ws.change_presence(activity=activity, status=status, afk=afk)
             guilds = [g for g in self._connection.guilds if g.shard_id == shard_id]
 
+        activities = () if activity is None else (activity,)
         for guild in guilds:
             me = guild.me
             if me is None:
                 continue
 
-            if activity is not None:
-                me.activities = (activity,)
+            me.activities = activities
             me.status = status_enum