diff --git a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java
index bcfd141fe0d..e6e4d7d6679 100644
--- a/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java	
+++ b/bundles/org.eclipse.swt/Eclipse SWT/win32/org/eclipse/swt/widgets/Control.java	
@@ -5940,13 +5940,13 @@ void sendZoomChangedEvent(Event event, Shell shell) {
 					notifyListeners(SWT.ZoomChanged, event);
 				}
 			} finally {
+				if (event == currentDpiChangeEvent) {
+					currentDpiChangeEvent = null;
+				}
 				if (shell.isDisposed()) {
 					return;
 				}
 				if (dpiExecData.decrement()) {
-					if (event == currentDpiChangeEvent) {
-						currentDpiChangeEvent = null;
-					}
 					if (event.doit) {
 						shell.WM_SIZE(0, 0);
 					}