diff --git a/src/renderers/dom/shared/ReactDOMComponent.js b/src/renderers/dom/shared/ReactDOMComponent.js
index 0a8b106837c00..7610be7b81406 100644
--- a/src/renderers/dom/shared/ReactDOMComponent.js
+++ b/src/renderers/dom/shared/ReactDOMComponent.js
@@ -519,12 +519,13 @@ ReactDOMComponent.Mixin = {
     var props = this._currentElement.props;
 
     switch (this._tag) {
+      case 'audio':
+      case 'form':
       case 'iframe':
-      case 'object':
       case 'img':
-      case 'form':
+      case 'link':
+      case 'object':
       case 'video':
-      case 'audio':
         this._wrapperState = {
           listeners: null,
         };
@@ -1091,12 +1092,13 @@ ReactDOMComponent.Mixin = {
    */
   unmountComponent: function(safely) {
     switch (this._tag) {
+      case 'audio':
+      case 'form':
       case 'iframe':
-      case 'object':
       case 'img':
-      case 'form':
+      case 'link':
+      case 'object':
       case 'video':
-      case 'audio':
         var listeners = this._wrapperState.listeners;
         if (listeners) {
           for (var i = 0; i < listeners.length; i++) {