diff --git a/lib/Client/Client.js b/lib/Client/Client.js
index 877efe134..8c2d2584b 100644
--- a/lib/Client/Client.js
+++ b/lib/Client/Client.js
@@ -209,7 +209,11 @@ var Client = (function (_EventEmitter) {
 	Client.prototype.sendFile = function sendFile(where, attachment, name) {
 		var callback = arguments.length <= 3 || arguments[3] === undefined ? function () /*err, m*/{} : arguments[3];
 
-		name = name ? name : require('path').basename(attachment);
+		if (typeof name === "function") {
+			// name is the callback
+			callback = name;
+			name = undefined; // Will get resolved into original filename in internal
+		}
 
 		return this.internal.sendFile(where, attachment, name).then(dataCallback(callback), errorCallback(callback));
 	};
diff --git a/src/Client/Client.js b/src/Client/Client.js
index 961d50103..40734a8df 100644
--- a/src/Client/Client.js
+++ b/src/Client/Client.js
@@ -191,8 +191,12 @@ export default class Client extends EventEmitter {
 
 	// def sendFile
 	sendFile(where, attachment, name, callback = (/*err, m*/) => { }) {
-		name = name ? name : require('path').basename(attachment);
-		
+		if (typeof name === "function") {
+			// name is the callback
+			callback = name;
+			name = undefined; // Will get resolved into original filename in internal
+		}
+
 		return this.internal.sendFile(where, attachment, name)
 			.then(dataCallback(callback), errorCallback(callback));
 	}