diff --git a/Modules.Config/ConfigManager.vb b/Modules.Config/ConfigManager.vb
index f471fb08..f94d645b 100644
--- a/Modules.Config/ConfigManager.vb
+++ b/Modules.Config/ConfigManager.vb
@@ -114,11 +114,13 @@ Public Class ConfigManager(Of T)
         _UserConfigPath = Path.Combine(_UserDirectory, USER_CONFIG_NAME)
 
         If ComputerConfigPath <> String.Empty Then
-            _ComputerDirectory = _File.CreateDirectory(ComputerConfigPath)
+            If IO.File.Exists(ComputerConfigPath) Then
+                _ComputerDirectory = _File.CreateDirectory(ComputerConfigPath, False)
+            End If
             _ComputerConfigPath = Path.Combine(_ComputerDirectory, COMPUTER_CONFIG_NAME)
         End If
 
-        If ApplicationStartupPath <> String.Empty Then
+            If ApplicationStartupPath <> String.Empty Then
             _Logger.Debug($"AppConfig is being used: [{ApplicationStartupPath}]")
             _AppConfigPath = Path.Combine(ApplicationStartupPath, APP_CONFIG_NAME)
         End If