diff --git a/vaadin-grid-flow-integration-tests/src/test/java/com/vaadin/flow/component/grid/it/GridTestScrollingOver100kLinesIT.java b/vaadin-grid-flow-integration-tests/src/test/java/com/vaadin/flow/component/grid/it/GridTestScrollingOver100kLinesIT.java
index 3c07aeab..bd001eb0 100644
--- a/vaadin-grid-flow-integration-tests/src/test/java/com/vaadin/flow/component/grid/it/GridTestScrollingOver100kLinesIT.java
+++ b/vaadin-grid-flow-integration-tests/src/test/java/com/vaadin/flow/component/grid/it/GridTestScrollingOver100kLinesIT.java
@@ -37,8 +37,7 @@ public void toStringIsUsedForObjectSerialization() {
 
         GridElement grid = $(GridElement.class).first();
 
-        TestBenchElement scroller = grid.$("vaadin-grid-outer-scroller")
-                .id("outerscroller");
+        TestBenchElement scroller = grid.$("table").id("table");
 
         // Scroll value that scrolls a bit further than the 100000th row to
         // trigger the loading loop issue (vaadin-grid-flow issue #578)
diff --git a/vaadin-grid-flow/pom.xml b/vaadin-grid-flow/pom.xml
index 8fa2f959..5e2c6be1 100644
--- a/vaadin-grid-flow/pom.xml
+++ b/vaadin-grid-flow/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>org.webjars.bowergithub.vaadin</groupId>
             <artifactId>vaadin-grid</artifactId>
-            <version>5.6.7</version>
+            <version>5.6.10</version>
         </dependency>
         <dependency>
             <groupId>org.webjars.bowergithub.polymerelements</groupId>
diff --git a/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/Grid.java b/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/Grid.java
index 23e6b3e5..d524dac0 100755
--- a/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/Grid.java
+++ b/vaadin-grid-flow/src/main/java/com/vaadin/flow/component/grid/Grid.java
@@ -126,7 +126,7 @@
  *
  */
 @Tag("vaadin-grid")
-@NpmPackage(value = "@vaadin/vaadin-grid", version = "5.6.7")
+@NpmPackage(value = "@vaadin/vaadin-grid", version = "5.6.10")
 @JsModule("@vaadin/vaadin-grid/src/vaadin-grid.js")
 @JsModule("@vaadin/vaadin-grid/src/vaadin-grid-column.js")
 @JsModule("@vaadin/vaadin-grid/src/vaadin-grid-sorter.js")
diff --git a/vaadin-grid-flow/src/main/resources/META-INF/resources/frontend/gridConnector.js b/vaadin-grid-flow/src/main/resources/META-INF/resources/frontend/gridConnector.js
index 3edb3650..4c30cc9f 100644
--- a/vaadin-grid-flow/src/main/resources/META-INF/resources/frontend/gridConnector.js
+++ b/vaadin-grid-flow/src/main/resources/META-INF/resources/frontend/gridConnector.js
@@ -918,9 +918,7 @@
 
       // TODO: should be removed once https://github.com/vaadin/vaadin-grid/issues/1471 gets implemented
       grid.$connector.setVerticalScrollingEnabled = tryCatchWrapper(function(enabled) {
-        // There are two scollable containers in grid so apply the changes for both
         setVerticalScrollingEnabled(grid.$.table, enabled);
-        setVerticalScrollingEnabled(grid.$.outerscroller, enabled);
 
         // Since the scrollbars were toggled, there might have been some changes to layout
         // size. Notify grid of the resize to ensure everything is in place.