diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c13e43..314adf4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
+## [6.0.2]
+ - Windows: drop un-needed assert
+ - EFI: do not send disconnect when not connected
+
 ## [6.0.1]
-- EFI: prefix internal function
-- Windows: add newlines to error messages
+ - EFI: prefix internal function
+ - Windows: add newlines to error messages
 
 ## [6.0.0]
 
diff --git a/VERSION b/VERSION
index 5fe6072..9b9a244 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.1
+6.0.2
diff --git a/src/Windows/metee_win.c b/src/Windows/metee_win.c
index 525007d..4b0b069 100644
--- a/src/Windows/metee_win.c
+++ b/src/Windows/metee_win.c
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2014-2025 Intel Corporation
  */
-#include <assert.h>
 #include <windows.h>
 #include <initguid.h>
 #include <winioctl.h>
diff --git a/src/Windows/metee_winhelpers.c b/src/Windows/metee_winhelpers.c
index ba21e68..439fef7 100644
--- a/src/Windows/metee_winhelpers.c
+++ b/src/Windows/metee_winhelpers.c
@@ -2,7 +2,6 @@
 /*
  * Copyright (C) 2014-2025 Intel Corporation
  */
-#include <assert.h>
 #include <windows.h>
 #include <initguid.h>
 #include "helpers.h"
@@ -13,7 +12,6 @@
 #include <Devpkey.h>
 #include <Strsafe.h>
 
-
 /*********************************************************************
 **                       Windows Helper Functions                   **
 **********************************************************************/
@@ -129,7 +127,6 @@ TEESTATUS EndOverlapped(IN PTEEHANDLE handle, IN EVENTHANDLE evt, IN DWORD milli
 	}
 
 	if (err != WAIT_OBJECT_0) {
-		assert(WAIT_FAILED == err);
 		err = GetLastError();
 		status = Win32ErrorToTee(err);
 
diff --git a/src/uefi/heci_efi.c b/src/uefi/heci_efi.c
index 6c449f0..cb1b5aa 100644
--- a/src/uefi/heci_efi.c
+++ b/src/uefi/heci_efi.c
@@ -299,6 +299,13 @@ EfiTeeHeciUninitialize(
 		goto End;
 	}
 
+	if (client->connected == FALSE)
+	{
+		DBGPRINT(Handle->TeeHandle, "Handle is not connected\n");
+		status = EFI_SUCCESS;
+		goto End;
+	}
+
 	SetMem(&disconnectMsg, sizeof(disconnectMsg), 0x0);
 	SetMem(&disconnectMsgReply, sizeof(disconnectMsgReply), 0x0);