diff --git a/src/corelib/kernel/qwineventnotifier.cpp b/src/corelib/kernel/qwineventnotifier.cpp
index 362111a2c8c..24de491326f 100644
--- a/src/corelib/kernel/qwineventnotifier.cpp
+++ b/src/corelib/kernel/qwineventnotifier.cpp
@@ -199,8 +199,11 @@ void QWinEventNotifier::setEnabled(bool enable)
     d->enabled = enable;
 
     QAbstractEventDispatcher *eventDispatcher = d->threadData->eventDispatcher.load();
-    if (!eventDispatcher) // perhaps application is shutting down
+    if (!eventDispatcher) { // perhaps application is shutting down
+        if (!enable && d->waitHandle != nullptr)
+            d->unregisterWaitObject();
         return;
+    }
     if (Q_UNLIKELY(thread() != QThread::currentThread())) {
         qWarning("QWinEventNotifier: Event notifiers cannot be enabled or disabled from another thread");
         return;