diff --git a/src/unstated.js b/src/unstated.js
index 6955ee0..e25236e 100644
--- a/src/unstated.js
+++ b/src/unstated.js
@@ -64,25 +64,46 @@ export type SubscribeProps<Containers: ContainersType> = {
   ) => Node
 };
 
-type SubscribeState = {};
+type SubscribeUpdaterProps<Containers: ContainersType> = {
+  instances: Array<ContainerType>,
+  children: (
+    ...instances: $TupleMap<Containers, <C>(Class<C> | C) => C>
+  ) => Node
+};
+type SubscribeUpdaterState = {};
 
 const DUMMY_STATE = {};
 
-export class Subscribe<Containers: ContainersType> extends React.Component<
-  SubscribeProps<Containers>,
-  SubscribeState
+class SubscribeUpdater<Containers: ContainersType> extends React.Component<
+  SubscribeUpdaterProps<Containers>,
+  SubscribeUpdaterState
 > {
   state = {};
-  instances: Array<ContainerType> = [];
   unmounted = false;
 
+  componentDidMount() {
+    this._subscribe(this.props.instances);
+  }
+
   componentWillUnmount() {
     this.unmounted = true;
-    this._unsubscribe();
+    this._unsubscribe(this.props.instances);
+  }
+
+  componentDidUpdate(prevProps: SubscribeUpdaterProps<Containers>) {
+    this._unsubscribe(prevProps.instances);
+    this._subscribe(this.props.instances);
   }
 
-  _unsubscribe() {
-    this.instances.forEach(container => {
+  _subscribe(instances: Array<ContainerType>) {
+    instances.forEach(container => {
+      container.unsubscribe(this.onUpdate);
+      container.subscribe(this.onUpdate);
+    });
+  }
+
+  _unsubscribe(instances: Array<ContainerType>) {
+    instances.forEach(container => {
       container.unsubscribe(this.onUpdate);
     });
   }
@@ -97,12 +118,18 @@ export class Subscribe<Containers: ContainersType> extends React.Component<
     });
   };
 
+  render() {
+    return this.props.children.apply(null, this.props.instances);
+  }
+}
+
+export class Subscribe<Containers: ContainersType> extends React.Component<
+  SubscribeProps<Containers>
+> {
   _createInstances(
     map: ContainerMapType | null,
     containers: ContainersType
   ): Array<ContainerType> {
-    this._unsubscribe();
-
     if (map === null) {
       throw new Error(
         'You must wrap your <Subscribe> components with a <Provider>'
@@ -110,7 +137,7 @@ export class Subscribe<Containers: ContainersType> extends React.Component<
     }
 
     let safeMap = map;
-    let instances = containers.map(ContainerItem => {
+    return containers.map(ContainerItem => {
       let instance;
 
       if (
@@ -127,25 +154,20 @@ export class Subscribe<Containers: ContainersType> extends React.Component<
         }
       }
 
-      instance.unsubscribe(this.onUpdate);
-      instance.subscribe(this.onUpdate);
-
       return instance;
     });
-
-    this.instances = instances;
-    return instances;
   }
 
   render() {
     return (
       <StateContext.Consumer>
-        {map =>
-          this.props.children.apply(
-            null,
-            this._createInstances(map, this.props.to)
-          )
-        }
+        {map => (
+          <SubscribeUpdater
+            instances={this._createInstances(map, this.props.to)}
+          >
+            {this.props.children}
+          </SubscribeUpdater>
+        )}
       </StateContext.Consumer>
     );
   }