diff --git a/scripts/Common/Scripts/Config.ps1 b/scripts/Common/Scripts/Config.ps1
index dd1f775d..02d45bbd 100644
--- a/scripts/Common/Scripts/Config.ps1
+++ b/scripts/Common/Scripts/Config.ps1
@@ -346,8 +346,13 @@ $null = New-Module {
             $Value
         )
 
-        $key = Get-SetupConfigKey;
-        $null = Set-ItemProperty ($key.PSPath) -Name $Name -Value $Value;
+        $key = (Get-SetupConfigKey).PSPath;
+
+        if ($null -eq $Value) {
+            Remove-ItemProperty $key -Name $Name;
+        } else {
+            $null = Set-ItemProperty $key -Name $Name -Value $Value;
+        }
     }
 
     <#