diff --git a/packages/xod-client/src/project/components/Node.jsx b/packages/xod-client/src/project/components/Node.jsx
index 76085c96..8c108032 100644
--- a/packages/xod-client/src/project/components/Node.jsx
+++ b/packages/xod-client/src/project/components/Node.jsx
@@ -72,18 +72,18 @@ class Node extends React.Component {
       position,
       size,
       type,
+      isDragged,
     } = this.props;
 
     const pinsArr = R.values(pins);
 
     const cls = classNames('Node', {
       'is-selected': this.props.isSelected,
-      'is-dragged': this.props.isDragged,
+      'is-dragged': isDragged,
       'is-ghost': this.props.isGhost,
       'is-errored': (this.props.errors.length > 0),
     });
 
-
     const svgStyle = {
       overflow: 'visible',
       opacity: this.props.hidden ? 0 : 1, // setting visibility is breaking masks
@@ -102,7 +102,7 @@ class Node extends React.Component {
 
     return (
       <TooltipHOC
-        content={renderTooltipContent(type, nodeLabel, errMessage)}
+        content={isDragged ? null : renderTooltipContent(type, nodeLabel, errMessage)}
         render={(onMouseOver, onMouseMove, onMouseLeave) => (
           <svg
             key={id}
diff --git a/packages/xod-client/src/tooltip/components/Tooltip.jsx b/packages/xod-client/src/tooltip/components/Tooltip.jsx
index 81f0c1fc..8c0e4889 100644
--- a/packages/xod-client/src/tooltip/components/Tooltip.jsx
+++ b/packages/xod-client/src/tooltip/components/Tooltip.jsx
@@ -46,6 +46,8 @@ class Tooltip extends React.Component {
   }
 
   render() {
+    if (!this.state.content) return null;
+
     const cls = cn('Tooltip', {
       'is-visible': this.state.shown,
     });