diff --git a/reactos/base/setup/usetup/settings.c b/reactos/base/setup/usetup/settings.c
index 732dde93956..ffc20ac286a 100644
--- a/reactos/base/setup/usetup/settings.c
+++ b/reactos/base/setup/usetup/settings.c
@@ -683,15 +683,13 @@ ProcessLocaleRegistry(PGENERIC_LIST List)
                             REG_SZ,
                             (PVOID)(LanguageId + 4),
                             8 * sizeof(PWCHAR));
+    NtClose(KeyHandle);
     if (!NT_SUCCESS(Status))
     {
         DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status);
-        NtClose(KeyHandle);
         return FALSE;
     }
 
-    NtClose(KeyHandle);
-
     return TRUE;
 }
 
@@ -990,14 +988,13 @@ SetGeoID(PWCHAR Id)
                                    REG_SZ,
                                    (PVOID)Id,
                                    (wcslen(Id) + 1) * sizeof(WCHAR));
+    NtClose(KeyHandle);
     if (!NT_SUCCESS(Status))
     {
          DPRINT1("NtSetValueKey() failed (Status = %lx)\n", Status);
-         NtClose(KeyHandle);
          return FALSE;
     }
 
-    NtClose(KeyHandle);
     return TRUE;
 }