diff --git a/atom-extensions/atom-commons/lib/jar-language-client.js b/atom-extensions/atom-commons/lib/jar-language-client.js
index 4d09c3d26..10ee372f9 100644
--- a/atom-extensions/atom-commons/lib/jar-language-client.js
+++ b/atom-extensions/atom-commons/lib/jar-language-client.js
@@ -27,7 +27,8 @@ export class JarLanguageClient extends AutoLanguageClient {
         let childProcess;
 
         return new Promise((resolve, reject) => {
-            PortFinder.getPort((err, port) => {
+            let basePort = Math.floor(Math.random() * 10000) + 40000;
+            PortFinder.getPort({port: basePort}, (err, port) => {
                 this.server = net.createServer(socket => {
                     this.socket = socket;
                     resolve(childProcess);
diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json
index fc8f69474..468391dd5 100644
--- a/atom-extensions/atom-commons/package.json
+++ b/atom-extensions/atom-commons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pivotal-atom-languageclient-commons",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "description": "Atom language client commons for STS4 language servers",
   "repository": "https://github.com/spring-projects/sts4",
   "license": "MIT",