diff --git a/components/dash-core-components/src/components/Tooltip.react.js b/components/dash-core-components/src/components/Tooltip.react.js
index 3c5505df43..005f48dfe8 100644
--- a/components/dash-core-components/src/components/Tooltip.react.js
+++ b/components/dash-core-components/src/components/Tooltip.react.js
@@ -2,7 +2,6 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import _JSXStyle from 'styled-jsx/style'; // eslint-disable-line no-unused-vars
-import LoadingElement from '../utils/LoadingElement';
 
 /**
  * A tooltip with an absolute position.
@@ -27,9 +26,9 @@ const Tooltip = ({
     return (
         <>
             <div className="dcc-tooltip-bounding-box">
-                <LoadingElement
-                    elementType="span"
+                <div
                     className={`hover hover-${direction}`}
+                    data-dash-is-loading={is_loading}
                 >
                     <span
                         id={id}
@@ -42,7 +41,7 @@ const Tooltip = ({
                             props.children
                         )}
                     </span>
-                </LoadingElement>
+                </div>
             </div>
             <style jsx>{`
                 .dcc-tooltip-bounding-box {
diff --git a/components/dash-core-components/tests/integration/graph/test_graph_responsive.py b/components/dash-core-components/tests/integration/graph/test_graph_responsive.py
index aea426e393..8f5664f4c1 100644
--- a/components/dash-core-components/tests/integration/graph/test_graph_responsive.py
+++ b/components/dash-core-components/tests/integration/graph/test_graph_responsive.py
@@ -205,7 +205,7 @@ def update_figures(n_clicks):
     dash_dcc.wait_for_text_to_equal("#generate-btn", "Generate Figures")
     dash_dcc.find_element("#generate-btn").click()
     dash_dcc.wait_for_text_to_equal("#bounding-output", "loaded")
-    dash_dcc.find_element(".dash-graph .js-plotly-plot.dash-graph--pending")
-    dash_dcc.find_element(".dash-graph .js-plotly-plot:not(.dash-graph--pending)")
+    dash_dcc.wait_for_element(".dash-graph .js-plotly-plot.dash-graph--pending")
+    dash_dcc.wait_for_element(".dash-graph .js-plotly-plot:not(.dash-graph--pending)")
     dash_dcc.find_element("#bounding-btn").click()
     dash_dcc.wait_for_text_to_equal("#bounding-output", "true")