diff --git a/packages/grid/src/vaadin-grid-drag-and-drop-mixin.js b/packages/grid/src/vaadin-grid-drag-and-drop-mixin.js
index 0c22cf4c296..f7809c35dc4 100644
--- a/packages/grid/src/vaadin-grid-drag-and-drop-mixin.js
+++ b/packages/grid/src/vaadin-grid-drag-and-drop-mixin.js
@@ -208,6 +208,9 @@ export const DragAndDropMixin = (superClass) =>
 
     /** @private */
     _onDragLeave(e) {
+      if (!this.dropMode) {
+        return;
+      }
       e.stopPropagation();
       this._clearDragStyles();
     }
diff --git a/packages/grid/test/drag-and-drop.test.js b/packages/grid/test/drag-and-drop.test.js
index ff2262141d0..9377ffdbda5 100644
--- a/packages/grid/test/drag-and-drop.test.js
+++ b/packages/grid/test/drag-and-drop.test.js
@@ -350,6 +350,8 @@ describe('drag and drop', () => {
       beforeEach(() => {
         dragEndSpy = sinon.spy();
         listenOnce(grid, 'grid-dragend', dragEndSpy);
+        grid.selectedItems = grid.items;
+        fireDragStart();
       });
 
       it('should stop the native event', () => {
@@ -359,8 +361,16 @@ describe('drag and drop', () => {
         expect(spy.called).to.be.false;
       });
 
+      it('should not stop the native event on grid itself', () => {
+        fireDragEnd();
+
+        const spy = sinon.spy();
+        listenOnce(grid, 'dragend', spy);
+        fireDragEnd(grid);
+        expect(spy.called).to.be.true;
+      });
+
       it('should remove dragging state attribute', () => {
-        fireDragStart();
         fireDragEnd();
         expect(grid.hasAttribute('dragging-rows')).to.be.false;
       });
@@ -511,13 +521,21 @@ describe('drag and drop', () => {
 
     describe('dragleave', () => {
       it('should stop the native event', () => {
+        grid.dropMode = 'on-grid';
         const spy = sinon.spy();
         listenOnce(grid, 'dragleave', spy);
         fireDragLeave();
         expect(spy.called).to.be.false;
       });
 
-      it('should clear the grid drag styles', () => {
+      it('should not stop the native event if grid has no drop mode', () => {
+        const spy = sinon.spy();
+        listenOnce(grid, 'dragleave', spy);
+        fireDragLeave();
+        expect(spy.called).to.be.true;
+      });
+
+      it('should clear the grid dragover attribute', () => {
         grid.dropMode = 'on-grid';
         fireDragOver();
         expect(grid.hasAttribute('dragover')).to.be.true;