diff --git a/Modules.Config/ConfigManager.vb b/Modules.Config/ConfigManager.vb
index e357490e..d8120d0b 100644
--- a/Modules.Config/ConfigManager.vb
+++ b/Modules.Config/ConfigManager.vb
@@ -86,8 +86,10 @@ Public Class ConfigManager(Of T)
         _UserDirectory = _File.CreateDirectory(UserConfigPath)
         _UserConfigPath = Path.Combine(_UserDirectory, USER_CONFIG_NAME)
 
-        _ComputerDirectory = _File.CreateDirectory(ComputerConfigPath)
-        _ComputerConfigPath = Path.Combine(_ComputerDirectory, COMPUTER_CONFIG_NAME)
+        If ComputerConfigPath <> String.Empty Then
+            _ComputerDirectory = _File.CreateDirectory(ComputerConfigPath)
+            _ComputerConfigPath = Path.Combine(_ComputerDirectory, COMPUTER_CONFIG_NAME)
+        End If
 
         If ApplicationStartupPath <> String.Empty Then
             _AppConfigPath = Path.Combine(ApplicationStartupPath, APP_CONFIG_NAME)