diff --git a/lib/Client/Resolver/Resolver.js b/lib/Client/Resolver/Resolver.js
index cdd7b6c9f..e154533d8 100644
--- a/lib/Client/Resolver/Resolver.js
+++ b/lib/Client/Resolver/Resolver.js
@@ -96,7 +96,7 @@ var Resolver = (function () {
 		}
 		if (resource instanceof _StructuresMessage2["default"]) {
 			if (resource.channel instanceof _StructuresTextChannel2["default"]) {
-				return resource.server;
+				return resource.channel.server;
 			}
 		}
 		return null;
diff --git a/src/Client/Resolver/Resolver.js b/src/Client/Resolver/Resolver.js
index a2721f6a3..3e51b214e 100644
--- a/src/Client/Resolver/Resolver.js
+++ b/src/Client/Resolver/Resolver.js
@@ -54,7 +54,7 @@ export default class Resolver {
 		}
 		if (resource instanceof Message) {
 			if (resource.channel instanceof TextChannel) {
-				return resource.server;
+				return resource.channel.server;
 			}
 		}
 		return null;