diff --git a/src/Tooltip.jsx b/src/Tooltip.jsx
index bada616..9072acf 100644
--- a/src/Tooltip.jsx
+++ b/src/Tooltip.jsx
@@ -74,11 +74,12 @@ class Tooltip extends Component {
       placement, align,
       destroyTooltipOnHide,
       defaultVisible, getTooltipContainer,
+      visible,
       ...restProps,
     } = this.props;
     const extraProps = { ...restProps };
-    if ('visible' in this.props) {
-      extraProps.popupVisible = this.props.visible;
+    if (typeof visible !== 'undefined') {
+      extraProps.popupVisible = visible;
     }
     return (<Trigger
       popupClassName={overlayClassName}
diff --git a/tests/index.test.js b/tests/index.test.js
index 96bd5f1..a925b15 100644
--- a/tests/index.test.js
+++ b/tests/index.test.js
@@ -10,6 +10,38 @@ const verifyContent = (wrapper, content) => {
 };
 
 describe('rc-tooltip', () => {
+  describe('show when set prop visible', () => {
+    it('is boolean', () => {
+      const wrapper = mount(
+        <Tooltip
+          visible
+          overlay={<strong className="x-content">Tooltip content</strong>}
+        >
+          <div className="target">Click this</div>
+        </Tooltip>
+      );
+
+      expect(wrapper.find('.x-content').text()).toBe('Tooltip content');
+      expect(wrapper.instance().getPopupDomNode()).toBeTruthy();
+    });
+
+    it('is undefined', () => {
+      const wrapper = mount(
+        <Tooltip
+          visible={undefined}
+          trigger={['click']}
+          placement="left"
+          overlay={<strong className="x-content">Tooltip content</strong>}
+        >
+          <div className="target">Click this</div>
+        </Tooltip>
+      );
+      wrapper.find('.target').simulate('click');
+      verifyContent(wrapper, 'Tooltip content');
+    });
+  });
+
+
   describe('shows and hides itself on click', () => {
     it('using an element overlay', () => {
       const wrapper = mount(