diff --git a/docs/docs_client.rst b/docs/docs_client.rst
index 46673609a..436cefc54 100644
--- a/docs/docs_client.rst
+++ b/docs/docs_client.rst
@@ -276,13 +276,12 @@ Removes a user from a server
 - **callback** - `function` taking the following:
     - **error** - error if any occurred.
 
-moveMember(user, server, channel, `callback`)
+moveMember(user, channel, `callback`)
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Moves a user from one voice channel into another.
 
 - **user** - A `User Resolvable`_ that should be moved
-- **server** - A `Server Resolvable`_ in which to move the user
 - **channel** - The `Channel Resolvable`_ to move the user to
 - **callback** - `function` taking the following:
     - **error** - error if any occurred.
diff --git a/lib/Client/Client.js b/lib/Client/Client.js
index c3c395c8a..16a701197 100644
--- a/lib/Client/Client.js
+++ b/lib/Client/Client.js
@@ -316,10 +316,10 @@ var Client = (function (_EventEmitter) {
 
 	// def moveMember
 
-	Client.prototype.moveMember = function moveMember(user, server, channel) {
-		var callback = arguments.length <= 3 || arguments[3] === undefined ? function () /*err, {}*/{} : arguments[3];
+	Client.prototype.moveMember = function moveMember(user, channel) {
+		var callback = arguments.length <= 2 || arguments[2] === undefined ? function () /*err, {}*/{} : arguments[2];
 
-		return this.internal.moveMember(user, server, channel).then(dataCallback(callback), errorCallback(callback));
+		return this.internal.moveMember(user, channel).then(dataCallback(callback), errorCallback(callback));
 	};
 
 	// def createRole
diff --git a/lib/Client/InternalClient.js b/lib/Client/InternalClient.js
index 4e0762ff8..89ffc099c 100644
--- a/lib/Client/InternalClient.js
+++ b/lib/Client/InternalClient.js
@@ -696,12 +696,13 @@ var InternalClient = (function () {
 
 	// def moveMember
 
-	InternalClient.prototype.moveMember = function moveMember(user, server, channel) {
+	InternalClient.prototype.moveMember = function moveMember(user, channel) {
 		var _this19 = this;
 
 		user = this.resolver.resolveUser(user);
-		server = this.resolver.resolveServer(server);
 		return this.resolver.resolveChannel(channel).then(function (channel) {
+			var server = channel.server;
+
 			// Make sure `channel` is a voice channel
 			if (channel.type !== "voice") {
 				throw new Error("Can't moveMember into a non-voice channel");
diff --git a/src/Client/Client.js b/src/Client/Client.js
index 82a32d5f9..c01331b7d 100644
--- a/src/Client/Client.js
+++ b/src/Client/Client.js
@@ -274,8 +274,8 @@ export default class Client extends EventEmitter {
 	}
 
 	// def moveMember
-	moveMember(user, server, channel, callback = (/*err, {}*/) => { }) {
-		return this.internal.moveMember(user, server, channel)
+	moveMember(user, channel, callback = (/*err, {}*/) => { }) {
+		return this.internal.moveMember(user, channel)
 			.then(dataCallback(callback), errorCallback(callback));
 	}
 
diff --git a/src/Client/InternalClient.js b/src/Client/InternalClient.js
index e3e18110a..e4f39bf7f 100644
--- a/src/Client/InternalClient.js
+++ b/src/Client/InternalClient.js
@@ -573,10 +573,11 @@ export default class InternalClient {
 	}
 
 	// def moveMember
-	moveMember(user, server, channel) {
+	moveMember(user, channel) {
 		user = this.resolver.resolveUser(user);
-		server = this.resolver.resolveServer(server);
 		return this.resolver.resolveChannel(channel).then(channel => {
+			var server = channel.server;
+
 			// Make sure `channel` is a voice channel
 			if(channel.type !== "voice") {
 				throw new Error("Can't moveMember into a non-voice channel");