diff --git a/endpoint/index.js b/endpoint/index.js
index 2b3d7eb22..45eba2c72 100644
--- a/endpoint/index.js
+++ b/endpoint/index.js
@@ -70,7 +70,15 @@ Generator.prototype.registerEndpoint = function registerEndpoint() {
 };
 
 Generator.prototype.createFiles = function createFiles() {
-  var dest = this.config.get('endpointDirectory') || 'server/api/' + this.name;
+  var destBase = this.config.get('endpointDirectory');
+  var dest = 'server/api/' + this.name;
+  if (destBase) {
+    if (destBase.charAt(destBase.length - 1) !== '/') {
+      destBase += '/';
+    }
+    dest = destBase + this.name;
+  }
+
   this.sourceRoot(path.join(__dirname, './templates'));
   ngUtil.processDirectory(this, '.', dest);
 };