diff --git a/base/setup/usetup/usetup.c b/base/setup/usetup/usetup.c
index 79b89824306..d076a524758 100644
--- a/base/setup/usetup/usetup.c
+++ b/base/setup/usetup/usetup.c
@@ -938,10 +938,10 @@ SetupStartPage(PINPUT_RECORD Ir)
     RequiredPartitionDiskSpace = (ULONG)IntValue;
 
     /* Start the PnP thread */
-    if (hPnpThread != INVALID_HANDLE_VALUE)
+    if (hPnpThread != NULL)
     {
         NtResumeThread(hPnpThread, NULL);
-        hPnpThread = INVALID_HANDLE_VALUE;
+        hPnpThread = NULL;
     }
 
     CheckUnattendedSetup();
@@ -5184,7 +5184,7 @@ RunUSetup(VOID)
                                  &hPnpThread,
                                  NULL);
     if (!NT_SUCCESS(Status))
-        hPnpThread = INVALID_HANDLE_VALUE;
+        hPnpThread = NULL;
 
     if (!CONSOLE_Init())
     {