diff --git a/dist/ngAutobahn.js b/dist/ngAutobahn.js
index 56f1472..d00f0e1 100644
--- a/dist/ngAutobahn.js
+++ b/dist/ngAutobahn.js
@@ -1,5 +1,5 @@
 /**
- * ngAutobahn - v0.0.6 - 2015-12-08
+ * ngAutobahn - v0.0.7 - 2015-12-08
  * https://github.com/ef-ctx/ngAutobahn
  *
  * Copyright (c) 2015 EF CTX <http://efclass.io>
@@ -490,12 +490,15 @@
                  ***************************************************************/
 
                 function unsubscribeBroker(brokerFacade) {
+                    var broker;
+
                     if (!brokerFacade) {
                         throw new Error('ngAutobahnSession.unsubscribeBroker error. No broker provided');
                     } else {
-                        var broker = _getBrokerByBrokerFacade(brokerFacade);
-                        _unsubscribeBroker(broker);
-                        delete _brokers[broker.subscription.id];
+                        broker = _getBrokerByBrokerFacade(brokerFacade);
+
+                        return _unsubscribeBroker(broker)
+                            .then(_deleteBroker);
                     }
                 }
 
@@ -588,8 +591,22 @@
                  * HELPERS
                  ***************************************************************/
 
+                function _deleteBroker(broker) {
+                    delete _brokers[broker.subscription.id];
+                }
+
                 function _unsubscribeBroker(broker) {
-                    _session.unsubscribe(broker.subscription);
+                    var defer = $q.defer();
+
+                    _session.unsubscribe(broker.subscription)
+                        .then(_resolveBroker, defer.reject);
+
+                    return defer.promise;
+
+                    function _resolveBroker() {
+                        defer.resolve(broker);
+                    }
+
                 }
 
                 function _unsubscribeAllBrokers() {
diff --git a/dist/ngAutobahn.min.js b/dist/ngAutobahn.min.js
index 9c65efd..3199e43 100644
--- a/dist/ngAutobahn.min.js
+++ b/dist/ngAutobahn.min.js
@@ -1 +1 @@
-!function(a){"use strict";a.module("ngAutobahn.connection",[]).constant("NG_AUTOBAHN_CONNECTION_STATUS",{OPENED:"ngAutobahn.connection.state.opened",CLOSED:"ngAutobahn.connection.state.closed",LOST:"ngAutobahn.connection.state.lost"}).constant("NG_AUTOBAHN_CONNECTION_EVENTS",{OPEN:"ngAutobahn.connection.open",CLOSE:"ngAutobahn.connection.close",LOST:"ngAutobahn.connection.lost"}).provider("ngAutobahnConnection",[function(){var b={},c={mockMode:!1,url:null,realm:null,retries:{max:100,initialDelay:3,delayGrowthFactor:1.5,maxDelay:300,delayJitter:.1}};this.configure=function(d){a.extend(c,d),b={url:c.url,realm:c.realm,max_retries:c.retries.max,initial_retry_delay:c.retries.initialDelay,retry_delay_growth:c.retries.delayGrowthFactor,max_retry_delay:c.retries.maxDelay,retry_delay_jitter:c.retries.delayJitter}},this.$get=["$q","$rootScope","NG_AUTOBAHN_CONNECTION_STATUS","NG_AUTOBAHN_CONNECTION_EVENTS",function(a,c,d,e){function f(){function f(){var c=a.defer();return q?(c.resolve(p),l()):(q=new autobahn.Connection(b),q.onopen=function(a){p=a,c.resolve(a),l()},q.onclose=function(a){c.reject(),j()},q.open()),c.promise}function g(){return h().then(k)}function h(){var b=a.defer();return q?(q.onclose=function(a){q=null,b.resolve()},q.close()):b.reject(),b.promise}function i(){j(),h().then(f)}function j(){s=d.LOST,o()}function k(){s=d.CLOSED,n()}function l(){s=d.OPENED,m()}function m(){c.$broadcast(e.OPEN,p)}function n(a){c.$broadcast(e.CLOSE,a)}function o(a){c.$broadcast(e.LOST,a)}var p,q,r=this,s=d.CLOSED;r.openConnection=f,r.closeConnection=g,r.resetConnection=i,Object.defineProperty(r,"status",{get:function(){return s}}),Object.defineProperty(r,"isOpen",{get:function(){return s===d.OPENED}}),Object.defineProperty(r,"isClosed",{get:function(){return s===d.CLOSED}}),Object.defineProperty(r,"isLost",{get:function(){return s===d.LOST}})}return new f}]}])}(angular),function(a){"use strict";a.module("ngAutobahn.messageBroker",[]).factory("NgAutobahnMessageBroker",["$rootScope",function(a){function b(b,c){function d(a,b){k[a]||(k[a]=[]),k[a].push(b)}function e(a,b){return c(j,a,b)}function f(){return j}function g(b,c){var d=c.channel,e=c.type,f=c.data;h(d,e)&&(i(e,f),a.$applyAsync())}function h(a,b){return j===a&&k[b]}function i(a,b){for(var c=k[a],d=0;d<c.length;d++)c[d](b)}var j=b,k={};return{facade:{publish:e,subscribe:d,getChannel:f},messageReceivedHandler:g,subscription:null,channel:j}}return b}])}(angular),function(a){"use strict";a.module("ngAutobahn",["ngAutobahn.connection","ngAutobahn.session"])}(angular),function(a){"use strict";a.module("ngAutobahn.session",["ngAutobahn.connection","ngAutobahn.messageBroker"]).service("ngAutobahnSession",["$q","$rootScope","ngAutobahnConnection","NgAutobahnMessageBroker","NG_AUTOBAHN_CONNECTION_EVENTS",function(a,b,c,d,e){function f(){function f(b){function e(){h(i),f.resolve(i.facade)}var f=a.defer(),i=new d(b,n);if(!b)throw new Error("ngAutobahn.session.subscribe error: Trying to subscribe without specifying channel");return v?e():c.openConnection().then(g)["finally"](e),f.promise}function g(a){v=a}function h(a){function b(b){a.subscription=b,w[b.id]=a}v.subscribe(a.channel,a.messageReceivedHandler).then(b)}function i(){for(var a in w){var b=w[a];h(b)}}function j(a){if(!a)throw new Error("ngAutobahnSession.unsubscribeBroker error. No broker provided");var b=u(a);r(b),delete w[b.subscription.id]}function k(a,b){v||(v=b,i())}function l(a,b){s(),v=null}function m(a,b){function d(){return v.call(a,[],e)}var e=b||{};return v?d():c.openConnection().then(d)}function n(c,d,e){var f,g,h=a.defer();return v?(f=o(d,e),g={acknowledge:!0},v.publish(c,[],o(d,e),g).then(h.resolve,h.reject)["finally"](b.$applyAsync)):h.reject("ngAutobahnConnection error no session was established"),h.promise}function o(a,b){return{type:a,data:b||{}}}function p(){return q()}function q(){var b=a.defer();return s(),t(),c.closeConnection().then(b.resolve,b.reject),b.promise}function r(a){v.unsubscribe(a.subscription)}function s(){for(var a in w)r(w[a])}function t(){w={}}function u(a){var b;for(var c in w)if(b=w[c],a===b.facade)return b;return null}var v,w={};this.subscribe=f,this.remoteCall=m,this.end=p,this.unsubscribeBroker=j,b.$on(e.OPEN,k),b.$on(e.CLOSE,l),b.$on(e.LOST,l)}return new f}])}(angular),function(a){"use strict";a.module("ngAutobahn.utils.connectionPing",["ngAutobahn","ngAutobahn.utils.ping"]).provider("ngAutobahnConnectionPing",["NgAutobahnPingProvider",function(b){var c=this,d={pingMessage:"ping",delay:1500,maxResponseDelay:3e3};b.configure({delay:d.delay,maxResponseDelay:d.maxResponseDelay}),c.configure=function(b){return a.extend(d,b),d},c.$get=["$rootScope","ngAutobahnConnection","ngAutobahnSession","NgAutobahnPing","NG_AUTOBAHN_CONNECTION_EVENTS",function(a,b,c,e,f){function g(){function g(){return b.resetConnection()}function h(){return c.remoteCall(d.pingMessage)}var i=this,j=new e(h,g);i.activate=function(){a.$on(f.OPEN,j.start),a.$on(f.LOST,j.stop),a.$on(f.CLOSE,j.stop),b.isOpened&&j.start()}}return new g}]}])}(angular),function(a){"use strict";a.module("ngAutobahn.utils.ping",[]).provider("NgAutobahnPing",[function(){var b=this,c={delay:1500,maxResponseDelay:3e3};b.configure=function(b){a.extend(c,b)},b.$get=["$timeout","$interval",function(a,b){function d(d,e){function f(){g(),h(),m=b(h,c.delay,0,!1)}function g(){j(),k()}function h(){l=a(i,c.maxResponseDelay),d().then(j)}function i(){g(),e()}function j(){a.cancel(l)}function k(){b.cancel(m)}var l,m,n=this;n.start=f,n.stop=g}return d}]}])}(angular);
\ No newline at end of file
+!function(a){"use strict";a.module("ngAutobahn.connection",[]).constant("NG_AUTOBAHN_CONNECTION_STATUS",{OPENED:"ngAutobahn.connection.state.opened",CLOSED:"ngAutobahn.connection.state.closed",LOST:"ngAutobahn.connection.state.lost"}).constant("NG_AUTOBAHN_CONNECTION_EVENTS",{OPEN:"ngAutobahn.connection.open",CLOSE:"ngAutobahn.connection.close",LOST:"ngAutobahn.connection.lost"}).provider("ngAutobahnConnection",[function(){var b={},c={mockMode:!1,url:null,realm:null,retries:{max:100,initialDelay:3,delayGrowthFactor:1.5,maxDelay:300,delayJitter:.1}};this.configure=function(d){a.extend(c,d),b={url:c.url,realm:c.realm,max_retries:c.retries.max,initial_retry_delay:c.retries.initialDelay,retry_delay_growth:c.retries.delayGrowthFactor,max_retry_delay:c.retries.maxDelay,retry_delay_jitter:c.retries.delayJitter}},this.$get=["$q","$rootScope","NG_AUTOBAHN_CONNECTION_STATUS","NG_AUTOBAHN_CONNECTION_EVENTS",function(a,c,d,e){function f(){function f(){var c=a.defer();return q?(c.resolve(p),l()):(q=new autobahn.Connection(b),q.onopen=function(a){p=a,c.resolve(a),l()},q.onclose=function(a){c.reject(),j()},q.open()),c.promise}function g(){return h().then(k)}function h(){var b=a.defer();return q?(q.onclose=function(a){q=null,b.resolve()},q.close()):b.reject(),b.promise}function i(){j(),h().then(f)}function j(){s=d.LOST,o()}function k(){s=d.CLOSED,n()}function l(){s=d.OPENED,m()}function m(){c.$broadcast(e.OPEN,p)}function n(a){c.$broadcast(e.CLOSE,a)}function o(a){c.$broadcast(e.LOST,a)}var p,q,r=this,s=d.CLOSED;r.openConnection=f,r.closeConnection=g,r.resetConnection=i,Object.defineProperty(r,"status",{get:function(){return s}}),Object.defineProperty(r,"isOpen",{get:function(){return s===d.OPENED}}),Object.defineProperty(r,"isClosed",{get:function(){return s===d.CLOSED}}),Object.defineProperty(r,"isLost",{get:function(){return s===d.LOST}})}return new f}]}])}(angular),function(a){"use strict";a.module("ngAutobahn.messageBroker",[]).factory("NgAutobahnMessageBroker",["$rootScope",function(a){function b(b,c){function d(a,b){k[a]||(k[a]=[]),k[a].push(b)}function e(a,b){return c(j,a,b)}function f(){return j}function g(b,c){var d=c.channel,e=c.type,f=c.data;h(d,e)&&(i(e,f),a.$applyAsync())}function h(a,b){return j===a&&k[b]}function i(a,b){for(var c=k[a],d=0;d<c.length;d++)c[d](b)}var j=b,k={};return{facade:{publish:e,subscribe:d,getChannel:f},messageReceivedHandler:g,subscription:null,channel:j}}return b}])}(angular),function(a){"use strict";a.module("ngAutobahn",["ngAutobahn.connection","ngAutobahn.session"])}(angular),function(a){"use strict";a.module("ngAutobahn.session",["ngAutobahn.connection","ngAutobahn.messageBroker"]).service("ngAutobahnSession",["$q","$rootScope","ngAutobahnConnection","NgAutobahnMessageBroker","NG_AUTOBAHN_CONNECTION_EVENTS",function(a,b,c,d,e){function f(){function f(b){function e(){h(i),f.resolve(i.facade)}var f=a.defer(),i=new d(b,n);if(!b)throw new Error("ngAutobahn.session.subscribe error: Trying to subscribe without specifying channel");return w?e():c.openConnection().then(g)["finally"](e),f.promise}function g(a){w=a}function h(a){function b(b){a.subscription=b,x[b.id]=a}w.subscribe(a.channel,a.messageReceivedHandler).then(b)}function i(){for(var a in x){var b=x[a];h(b)}}function j(a){var b;if(a)return b=v(a),s(b).then(r);throw new Error("ngAutobahnSession.unsubscribeBroker error. No broker provided")}function k(a,b){w||(w=b,i())}function l(a,b){t(),w=null}function m(a,b){function d(){return w.call(a,[],e)}var e=b||{};return w?d():c.openConnection().then(d)}function n(c,d,e){var f,g,h=a.defer();return w?(f=o(d,e),g={acknowledge:!0},w.publish(c,[],o(d,e),g).then(h.resolve,h.reject)["finally"](b.$applyAsync)):h.reject("ngAutobahnConnection error no session was established"),h.promise}function o(a,b){return{type:a,data:b||{}}}function p(){return q()}function q(){var b=a.defer();return t(),u(),c.closeConnection().then(b.resolve,b.reject),b.promise}function r(a){delete x[a.subscription.id]}function s(b){function c(){d.resolve(b)}var d=a.defer();return w.unsubscribe(b.subscription).then(c,d.reject),d.promise}function t(){for(var a in x)s(x[a])}function u(){x={}}function v(a){var b;for(var c in x)if(b=x[c],a===b.facade)return b;return null}var w,x={};this.subscribe=f,this.remoteCall=m,this.end=p,this.unsubscribeBroker=j,b.$on(e.OPEN,k),b.$on(e.CLOSE,l),b.$on(e.LOST,l)}return new f}])}(angular),function(a){"use strict";a.module("ngAutobahn.utils.connectionPing",["ngAutobahn","ngAutobahn.utils.ping"]).provider("ngAutobahnConnectionPing",["NgAutobahnPingProvider",function(b){var c=this,d={pingMessage:"ping",delay:1500,maxResponseDelay:3e3};b.configure({delay:d.delay,maxResponseDelay:d.maxResponseDelay}),c.configure=function(b){return a.extend(d,b),d},c.$get=["$rootScope","ngAutobahnConnection","ngAutobahnSession","NgAutobahnPing","NG_AUTOBAHN_CONNECTION_EVENTS",function(a,b,c,e,f){function g(){function g(){return b.resetConnection()}function h(){return c.remoteCall(d.pingMessage)}var i=this,j=new e(h,g);i.activate=function(){a.$on(f.OPEN,j.start),a.$on(f.LOST,j.stop),a.$on(f.CLOSE,j.stop),b.isOpened&&j.start()}}return new g}]}])}(angular),function(a){"use strict";a.module("ngAutobahn.utils.ping",[]).provider("NgAutobahnPing",[function(){var b=this,c={delay:1500,maxResponseDelay:3e3};b.configure=function(b){a.extend(c,b)},b.$get=["$timeout","$interval",function(a,b){function d(d,e){function f(){g(),h(),m=b(h,c.delay,0,!1)}function g(){j(),k()}function h(){l=a(i,c.maxResponseDelay),d().then(j)}function i(){g(),e()}function j(){a.cancel(l)}function k(){b.cancel(m)}var l,m,n=this;n.start=f,n.stop=g}return d}]}])}(angular);
\ No newline at end of file
diff --git a/src/lib/ngAutobahn/session/session.js b/src/lib/ngAutobahn/session/session.js
index 4634319..aae6c03 100644
--- a/src/lib/ngAutobahn/session/session.js
+++ b/src/lib/ngAutobahn/session/session.js
@@ -105,12 +105,15 @@
                  ***************************************************************/
 
                 function unsubscribeBroker(brokerFacade) {
+                    var broker;
+
                     if (!brokerFacade) {
                         throw new Error('ngAutobahnSession.unsubscribeBroker error. No broker provided');
                     } else {
-                        var broker = _getBrokerByBrokerFacade(brokerFacade);
-                        _unsubscribeBroker(broker);
-                        delete _brokers[broker.subscription.id];
+                        broker = _getBrokerByBrokerFacade(brokerFacade);
+
+                        return _unsubscribeBroker(broker)
+                            .then(_deleteBroker);
                     }
                 }
 
@@ -203,8 +206,22 @@
                  * HELPERS
                  ***************************************************************/
 
+                function _deleteBroker(broker) {
+                    delete _brokers[broker.subscription.id];
+                }
+
                 function _unsubscribeBroker(broker) {
-                    _session.unsubscribe(broker.subscription);
+                    var defer = $q.defer();
+
+                    _session.unsubscribe(broker.subscription)
+                        .then(_resolveBroker, defer.reject);
+
+                    return defer.promise;
+
+                    function _resolveBroker() {
+                        defer.resolve(broker);
+                    }
+
                 }
 
                 function _unsubscribeAllBrokers() {
diff --git a/src/lib/ngAutobahn/session/session.spec.js b/src/lib/ngAutobahn/session/session.spec.js
index b96435a..42594f5 100644
--- a/src/lib/ngAutobahn/session/session.spec.js
+++ b/src/lib/ngAutobahn/session/session.spec.js
@@ -23,7 +23,11 @@ describe('ngAutobahnSession', function () {
                     defer.resolve();
                     return defer.promise;
                 },
-                unsubscribe: function () {}
+                unsubscribe: function () {
+                    var defer = $q.defer();
+                    defer.resolve();
+                    return defer.promise;
+                }
             }
         },
         handlers = {
@@ -371,10 +375,6 @@ describe('ngAutobahnSession', function () {
             $timeout.flush();
         }));
 
-        it('SHOULD be a function', function () {
-            expect(typeof _session.unsubscribeBroker).toBe('function');
-        });
-
         describe('IF a broker is provided', function () {
             it('SHOULD invoke autobahn.session.unsubscribe with the broker´s subscription', function () {
                 _session.unsubscribeBroker(_broker);