diff --git a/discord/client.py b/discord/client.py
index 00465797d..e0f74192b 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -947,7 +947,8 @@ class Client:
             if me is None:
                 continue
 
-            me.activities = (activity,)
+            if activity is not None:
+                me.activities = (activity,)
             me.status = status_enum
 
     # Guild stuff
diff --git a/discord/shard.py b/discord/shard.py
index 53c09c0de..2ea59dbcf 100644
--- a/discord/shard.py
+++ b/discord/shard.py
@@ -353,5 +353,6 @@ class AutoShardedClient(Client):
             if me is None:
                 continue
 
-            me.activities = (activity,)
+            if activity is not None:
+                me.activities = (activity,)
             me.status = status_enum