diff --git a/src/client/ClientDataResolver.js b/src/client/ClientDataResolver.js
index 04ff7aeb6..dd9620f3d 100644
--- a/src/client/ClientDataResolver.js
+++ b/src/client/ClientDataResolver.js
@@ -66,6 +66,11 @@ class ClientDataResolver {
     if (guild instanceof Guild) {
       return guild;
     }
+
+    if (typeof guild === 'string') {
+      return this.client.guilds.get(guild);
+    }
+
     return null;
   }