diff --git a/src/dom/DOMPropertyOperations.js b/src/dom/DOMPropertyOperations.js
index 4d4f6b438584..e4673e119fb9 100644
--- a/src/dom/DOMPropertyOperations.js
+++ b/src/dom/DOMPropertyOperations.js
@@ -147,8 +147,10 @@ var DOMPropertyOperations = {
       }
     } else if (DOMProperty.isCustomAttribute(name)) {
       node.removeAttribute(name);
-    } else if (__DEV__) {
-      warnUnknownProperty(name);
+    } else {
+      if (__DEV__) {
+        warnUnknownProperty(name);
+      }
     }
   }