diff --git a/commonjs/JobProvider.js b/commonjs/JobProvider.js
index b6a6ef7..031bb0a 100644
--- a/commonjs/JobProvider.js
+++ b/commonjs/JobProvider.js
@@ -51,6 +51,9 @@ var JobProvider = function (_Component) {
             var rehydration = _this2.rehydrateState.jobs[id];
             delete _this2.rehydrateState.jobs[id];
             return rehydration;
+          },
+          removeRehydrate: function removeRehydrate(id) {
+            delete _this2.rehydrateState.jobs[id];
           }
         }
       };
@@ -88,7 +91,8 @@ JobProvider.childContextTypes = {
     getNextId: _react.PropTypes.func.isRequired,
     register: _react.PropTypes.func.isRequired,
     get: _react.PropTypes.func.isRequired,
-    getRehydrate: _react2.default.PropTypes.func.isRequired
+    getRehydrate: _react2.default.PropTypes.func.isRequired,
+    removeRehydrate: _react2.default.PropTypes.func.isRequired
   }).isRequired
 };
 exports.default = JobProvider;
\ No newline at end of file
diff --git a/commonjs/withJob.js b/commonjs/withJob.js
index 1f5eb42..943a55c 100644
--- a/commonjs/withJob.js
+++ b/commonjs/withJob.js
@@ -109,6 +109,10 @@ function withJob(config) {
           if (!this.state.completed) {
             this.resolveWork(this.props);
           }
+
+          if (this.context.jobs && env === 'browser') {
+            this.context.jobs.removeRehydrate(id);
+          }
         }
       }, {
         key: 'componentWillUnmount',
@@ -150,7 +154,8 @@ function withJob(config) {
         getNextId: _react.PropTypes.func.isRequired,
         register: _react.PropTypes.func.isRequired,
         get: _react.PropTypes.func.isRequired,
-        getRehydrate: _react2.default.PropTypes.func.isRequired
+        getRehydrate: _react2.default.PropTypes.func.isRequired,
+        removeRehydrate: _react2.default.PropTypes.func.isRequired
       })
     };
 
diff --git a/package.json b/package.json
index 18d1729..fd76921 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-jobs",
-  "version": "1.0.0-alpha.1",
+  "version": "1.0.0-alpha.2",
   "description": "Attach asynchronous/synchronous \"jobs\" to your components, with SSR support.",
   "license": "MIT",
   "main": "commonjs/index.js",
diff --git a/umd/react-jobs.js b/umd/react-jobs.js
index b323df4..a5cd83d 100644
--- a/umd/react-jobs.js
+++ b/umd/react-jobs.js
@@ -171,6 +171,9 @@ var JobProvider = function (_Component) {
             var rehydration = _this2.rehydrateState.jobs[id];
             delete _this2.rehydrateState.jobs[id];
             return rehydration;
+          },
+          removeRehydrate: function removeRehydrate(id) {
+            delete _this2.rehydrateState.jobs[id];
           }
         }
       };
@@ -208,7 +211,8 @@ JobProvider.childContextTypes = {
     getNextId: _react.PropTypes.func.isRequired,
     register: _react.PropTypes.func.isRequired,
     get: _react.PropTypes.func.isRequired,
-    getRehydrate: _react2.default.PropTypes.func.isRequired
+    getRehydrate: _react2.default.PropTypes.func.isRequired,
+    removeRehydrate: _react2.default.PropTypes.func.isRequired
   }).isRequired
 };
 exports.default = JobProvider;
@@ -329,6 +333,10 @@ function withJob(config) {
           if (!this.state.completed) {
             this.resolveWork(this.props);
           }
+
+          if (this.context.jobs && env === 'browser') {
+            this.context.jobs.removeRehydrate(id);
+          }
         }
       }, {
         key: 'componentWillUnmount',
@@ -370,7 +378,8 @@ function withJob(config) {
         getNextId: _react.PropTypes.func.isRequired,
         register: _react.PropTypes.func.isRequired,
         get: _react.PropTypes.func.isRequired,
-        getRehydrate: _react2.default.PropTypes.func.isRequired
+        getRehydrate: _react2.default.PropTypes.func.isRequired,
+        removeRehydrate: _react2.default.PropTypes.func.isRequired
       })
     };
 
diff --git a/umd/react-jobs.min.js b/umd/react-jobs.min.js
index 3dbb11d..bfeb3c8 100644
--- a/umd/react-jobs.min.js
+++ b/umd/react-jobs.min.js
@@ -1 +1 @@
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("react")):"function"==typeof define&&define.amd?define(["react"],t):"object"==typeof exports?exports.ReactJobs=t(require("react")):e.ReactJobs=t(e.React)}(this,function(e){return function(e){function t(r){if(o[r])return o[r].exports;var n=o[r]={i:r,l:!1,exports:{}};return e[r].call(n.exports,n,n.exports,t),n.l=!0,n.exports}var o={};return t.m=e,t.c=o,t.i=function(e){return e},t.d=function(e,o,r){t.o(e,o)||Object.defineProperty(e,o,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var o=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(o,"a",o),o},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=4)}([function(e,t,o){"use strict";function r(){var e=0,t={};return{getNextId:function(){return e+=1},register:function(e,o){t[e]=o},get:function(e){return t[e]},getState:function(){return{jobs:t}}}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r},function(t,o){t.exports=e},function(e,t,o){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function u(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var s=function(){function e(e,t){for(var o=0;o<t.length;o++){var r=t[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,o,r){return o&&e(t.prototype,o),r&&e(t,r),t}}(),a=o(1),c=r(a),f=o(0),p=r(f),l=function(e){function t(){return n(this,t),i(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return u(t,e),s(t,[{key:"componentWillMount",value:function(){this.jobContext=this.props.jobContext||(0,p.default)(),this.rehydrateState=this.props.rehydrateState}},{key:"getChildContext",value:function(){var e=this;return{jobs:{getNextId:this.jobContext.getNextId,register:this.jobContext.register,get:this.jobContext.get,getRehydrate:function(t){var o=e.rehydrateState.jobs[t];return delete e.rehydrateState.jobs[t],o}}}}},{key:"render",value:function(){return c.default.Children.only(this.props.children)}}]),t}(a.Component);l.propTypes={children:a.PropTypes.node.isRequired,jobContext:a.PropTypes.shape({getNextId:a.PropTypes.func.isRequired,register:a.PropTypes.func.isRequired,get:a.PropTypes.func.isRequired,getState:a.PropTypes.func.isRequired}),rehydrateState:a.PropTypes.shape({jobs:a.PropTypes.object.isRequired})},l.defaultProps={jobContext:null,rehydrateState:{jobs:{}}},l.childContextTypes={jobs:a.PropTypes.shape({getNextId:a.PropTypes.func.isRequired,register:a.PropTypes.func.isRequired,get:a.PropTypes.func.isRequired,getRehydrate:c.default.PropTypes.func.isRequired}).isRequired},t.default=l},function(e,t,o){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function n(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function u(e){if("object"!==(void 0===e?"undefined":c(e)))throw new Error("You must provide a config object to withJob");var t=e.work,o=e.LoadingComponent,u=e.ErrorComponent,b=e.serverMode,h=void 0===b?"resolve":b,v=e.shouldWorkAgain,m=void 0===v?y:v;if("function"!=typeof t)throw new Error("You must provide a work function to withJob");if(-1===d.indexOf(h))throw new Error("Invalid serverMode provided to asyncComponent");var j="undefined"==typeof window?"node":"browser";return function(e){var c=void 0,d=function(t){function f(e,t){r(this,f);var o=n(this,(f.__proto__||Object.getPrototypeOf(f)).call(this,e,t));return y.call(o),t.jobs&&!c&&(c=t.jobs.getNextId()),o}return i(f,t),a(f,[{key:"asyncBootstrap",value:function(){return"browser"===j||"defer"!==h&&this.resolveWork(this.props)}},{key:"componentWillMount",value:function(){var e=void 0;this.context.jobs&&(e="browser"===j?this.context.jobs.getRehydrate(c):this.context.jobs.get(c)),this.state={data:e?e.data:null,error:null,completed:null!=e}}},{key:"componentDidMount",value:function(){this.state.completed||this.resolveWork(this.props)}},{key:"componentWillUnmount",value:function(){this.unmounted=!0}},{key:"componentWillReceiveProps",value:function(e){m((0,l.propsWithoutInternal)(this.props),(0,l.propsWithoutInternal)(e),this.getJobState())&&this.resolveWork(e)}},{key:"render",value:function(){var t=this.state,r=t.data,n=t.error,i=t.completed;return n?u?p.default.createElement(u,s({},this.props,{error:n})):null:i?p.default.createElement(e,s({},this.props,{jobResult:r})):o?p.default.createElement(o,this.props):null}}]),f}(f.Component);d.displayName="WithJob("+(0,l.getDisplayName)(e)+")",d.contextTypes={jobs:f.PropTypes.shape({getNextId:f.PropTypes.func.isRequired,register:f.PropTypes.func.isRequired,get:f.PropTypes.func.isRequired,getRehydrate:p.default.PropTypes.func.isRequired})};var y=function(){var e=this;this.resolveWork=function(o){var r=void 0;try{r=t(o)}catch(t){return e.setState({completed:!0,error:t}),!1}return(0,l.isPromise)(r)?r.then(function(t){if(!e.unmounted)return e.setState({completed:!0,data:t}),e.context.jobs&&e.context.jobs.register(c,{data:t}),!0}).catch(function(t){if(!e.unmounted)return"browser"===j?setTimeout(function(){e.unmounted||e.setState({completed:!0,error:t})},16):(console.warn("Failed to resolve job"),console.warn(t)),!1}):(e.setState({completed:!0,data:r}),!0)},this.getJobState=function(){return{completed:e.state.completed,error:e.state.error,data:e.state.data}}};return d}}Object.defineProperty(t,"__esModule",{value:!0});var s=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var o=arguments[t];for(var r in o)Object.prototype.hasOwnProperty.call(o,r)&&(e[r]=o[r])}return e},a=function(){function e(e,t){for(var o=0;o<t.length;o++){var r=t[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,o,r){return o&&e(t.prototype,o),r&&e(t,r),t}}(),c="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};t.default=u;var f=o(1),p=function(e){return e&&e.__esModule?e:{default:e}}(f),l=o(5),d=["resolve","defer","boundary"],y=function(){return!1}},function(e,t,o){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.createJobContext=t.JobProvider=t.withJob=void 0;var n=o(3),i=r(n),u=o(2),s=r(u),a=o(0),c=r(a);t.withJob=i.default,t.JobProvider=s.default,t.createJobContext=c.default},function(e,t,o){"use strict";function r(e,t){var o={};for(var r in e)t.indexOf(r)>=0||Object.prototype.hasOwnProperty.call(e,r)&&(o[r]=e[r]);return o}function n(e){return e.displayName||e.name||"Component"}Object.defineProperty(t,"__esModule",{value:!0});var i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};t.getDisplayName=n;var u=(t.isPromise=function(e){return"object"===(void 0===e?"undefined":i(e))&&"function"==typeof e.then},function(e){e.jobInitState,e.onJobProcessed;return r(e,["jobInitState","onJobProcessed"])});t.propsWithoutInternal=u}])});
\ No newline at end of file
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t(require("react")):"function"==typeof define&&define.amd?define(["react"],t):"object"==typeof exports?exports.ReactJobs=t(require("react")):e.ReactJobs=t(e.React)}(this,function(e){return function(e){function t(r){if(o[r])return o[r].exports;var n=o[r]={i:r,l:!1,exports:{}};return e[r].call(n.exports,n,n.exports,t),n.l=!0,n.exports}var o={};return t.m=e,t.c=o,t.i=function(e){return e},t.d=function(e,o,r){t.o(e,o)||Object.defineProperty(e,o,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var o=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(o,"a",o),o},t.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},t.p="",t(t.s=4)}([function(e,t,o){"use strict";function r(){var e=0,t={};return{getNextId:function(){return e+=1},register:function(e,o){t[e]=o},get:function(e){return t[e]},getState:function(){return{jobs:t}}}}Object.defineProperty(t,"__esModule",{value:!0}),t.default=r},function(t,o){t.exports=e},function(e,t,o){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}function n(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function u(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}Object.defineProperty(t,"__esModule",{value:!0});var s=function(){function e(e,t){for(var o=0;o<t.length;o++){var r=t[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,o,r){return o&&e(t.prototype,o),r&&e(t,r),t}}(),a=o(1),c=r(a),f=o(0),p=r(f),l=function(e){function t(){return n(this,t),i(this,(t.__proto__||Object.getPrototypeOf(t)).apply(this,arguments))}return u(t,e),s(t,[{key:"componentWillMount",value:function(){this.jobContext=this.props.jobContext||(0,p.default)(),this.rehydrateState=this.props.rehydrateState}},{key:"getChildContext",value:function(){var e=this;return{jobs:{getNextId:this.jobContext.getNextId,register:this.jobContext.register,get:this.jobContext.get,getRehydrate:function(t){var o=e.rehydrateState.jobs[t];return delete e.rehydrateState.jobs[t],o},removeRehydrate:function(t){delete e.rehydrateState.jobs[t]}}}}},{key:"render",value:function(){return c.default.Children.only(this.props.children)}}]),t}(a.Component);l.propTypes={children:a.PropTypes.node.isRequired,jobContext:a.PropTypes.shape({getNextId:a.PropTypes.func.isRequired,register:a.PropTypes.func.isRequired,get:a.PropTypes.func.isRequired,getState:a.PropTypes.func.isRequired}),rehydrateState:a.PropTypes.shape({jobs:a.PropTypes.object.isRequired})},l.defaultProps={jobContext:null,rehydrateState:{jobs:{}}},l.childContextTypes={jobs:a.PropTypes.shape({getNextId:a.PropTypes.func.isRequired,register:a.PropTypes.func.isRequired,get:a.PropTypes.func.isRequired,getRehydrate:c.default.PropTypes.func.isRequired,removeRehydrate:c.default.PropTypes.func.isRequired}).isRequired},t.default=l},function(e,t,o){"use strict";function r(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function n(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function i(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):e.__proto__=t)}function u(e){if("object"!==(void 0===e?"undefined":c(e)))throw new Error("You must provide a config object to withJob");var t=e.work,o=e.LoadingComponent,u=e.ErrorComponent,b=e.serverMode,h=void 0===b?"resolve":b,v=e.shouldWorkAgain,m=void 0===v?y:v;if("function"!=typeof t)throw new Error("You must provide a work function to withJob");if(-1===d.indexOf(h))throw new Error("Invalid serverMode provided to asyncComponent");var j="undefined"==typeof window?"node":"browser";return function(e){var c=void 0,d=function(t){function f(e,t){r(this,f);var o=n(this,(f.__proto__||Object.getPrototypeOf(f)).call(this,e,t));return y.call(o),t.jobs&&!c&&(c=t.jobs.getNextId()),o}return i(f,t),a(f,[{key:"asyncBootstrap",value:function(){return"browser"===j||"defer"!==h&&this.resolveWork(this.props)}},{key:"componentWillMount",value:function(){var e=void 0;this.context.jobs&&(e="browser"===j?this.context.jobs.getRehydrate(c):this.context.jobs.get(c)),this.state={data:e?e.data:null,error:null,completed:null!=e}}},{key:"componentDidMount",value:function(){this.state.completed||this.resolveWork(this.props),this.context.jobs&&"browser"===j&&this.context.jobs.removeRehydrate(c)}},{key:"componentWillUnmount",value:function(){this.unmounted=!0}},{key:"componentWillReceiveProps",value:function(e){m((0,l.propsWithoutInternal)(this.props),(0,l.propsWithoutInternal)(e),this.getJobState())&&this.resolveWork(e)}},{key:"render",value:function(){var t=this.state,r=t.data,n=t.error,i=t.completed;return n?u?p.default.createElement(u,s({},this.props,{error:n})):null:i?p.default.createElement(e,s({},this.props,{jobResult:r})):o?p.default.createElement(o,this.props):null}}]),f}(f.Component);d.displayName="WithJob("+(0,l.getDisplayName)(e)+")",d.contextTypes={jobs:f.PropTypes.shape({getNextId:f.PropTypes.func.isRequired,register:f.PropTypes.func.isRequired,get:f.PropTypes.func.isRequired,getRehydrate:p.default.PropTypes.func.isRequired,removeRehydrate:p.default.PropTypes.func.isRequired})};var y=function(){var e=this;this.resolveWork=function(o){var r=void 0;try{r=t(o)}catch(t){return e.setState({completed:!0,error:t}),!1}return(0,l.isPromise)(r)?r.then(function(t){if(!e.unmounted)return e.setState({completed:!0,data:t}),e.context.jobs&&e.context.jobs.register(c,{data:t}),!0}).catch(function(t){if(!e.unmounted)return"browser"===j?setTimeout(function(){e.unmounted||e.setState({completed:!0,error:t})},16):(console.warn("Failed to resolve job"),console.warn(t)),!1}):(e.setState({completed:!0,data:r}),!0)},this.getJobState=function(){return{completed:e.state.completed,error:e.state.error,data:e.state.data}}};return d}}Object.defineProperty(t,"__esModule",{value:!0});var s=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var o=arguments[t];for(var r in o)Object.prototype.hasOwnProperty.call(o,r)&&(e[r]=o[r])}return e},a=function(){function e(e,t){for(var o=0;o<t.length;o++){var r=t[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}return function(t,o,r){return o&&e(t.prototype,o),r&&e(t,r),t}}(),c="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};t.default=u;var f=o(1),p=function(e){return e&&e.__esModule?e:{default:e}}(f),l=o(5),d=["resolve","defer","boundary"],y=function(){return!1}},function(e,t,o){"use strict";function r(e){return e&&e.__esModule?e:{default:e}}Object.defineProperty(t,"__esModule",{value:!0}),t.createJobContext=t.JobProvider=t.withJob=void 0;var n=o(3),i=r(n),u=o(2),s=r(u),a=o(0),c=r(a);t.withJob=i.default,t.JobProvider=s.default,t.createJobContext=c.default},function(e,t,o){"use strict";function r(e,t){var o={};for(var r in e)t.indexOf(r)>=0||Object.prototype.hasOwnProperty.call(e,r)&&(o[r]=e[r]);return o}function n(e){return e.displayName||e.name||"Component"}Object.defineProperty(t,"__esModule",{value:!0});var i="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e};t.getDisplayName=n;var u=(t.isPromise=function(e){return"object"===(void 0===e?"undefined":i(e))&&"function"==typeof e.then},function(e){e.jobInitState,e.onJobProcessed;return r(e,["jobInitState","onJobProcessed"])});t.propsWithoutInternal=u}])});
\ No newline at end of file