diff --git a/lib/wsp.js b/lib/wsp.js
index c66304d2..5a465126 100644
--- a/lib/wsp.js
+++ b/lib/wsp.js
@@ -8,7 +8,7 @@
 		gun.__.opt.ws = opt.ws = gun.__.opt.ws || opt.ws || {};
 		function start(server, port){
 			gun.__.opt.ws.server = gun.__.opt.ws.server || opt.ws.server || server;
-			if(server.use){ server.use(gun.__.opt.ws.server) }
+			if(server.use){ server.use(gun.wsp.server) }
 			require('./ws')(gun.wsp.ws = gun.wsp.ws || new ws(gun.__.opt.ws), function(req, res){
 				var ws = this;
 				req.headers['gun-sid'] = ws.sid = ws.sid? ws.sid : req.headers['gun-sid'];
@@ -31,6 +31,10 @@
 					start(server, server.address().port);
 					return gun;
 				}
+			} else
+			if(Gun.fns.is(server.get) && server.get('port')){
+				start(server, server.get('port'));
+				return gun;
 			}
 			var listen = server.listen;
 			server.listen = function(port){
@@ -196,4 +200,4 @@
 			wsp(opt.server);
 		}
 	});
-}({}));
\ No newline at end of file
+}({}));