diff --git a/src/OverlayTrigger.jsx b/src/OverlayTrigger.jsx
index 574956c693..b706bf91cb 100644
--- a/src/OverlayTrigger.jsx
+++ b/src/OverlayTrigger.jsx
@@ -119,7 +119,9 @@ var OverlayTrigger = React.createClass({
   },
 
   componentDidMount: function() {
-    this.updateOverlayPosition();
+    if (this.props.defaultOverlayShown) {
+      this.updateOverlayPosition();
+    }
   },
 
   handleDelayedShow: function () {