diff --git a/Ombi.Store/DbConfiguration.cs b/Ombi.Store/DbConfiguration.cs
index bc519431b..9758509a8 100644
--- a/Ombi.Store/DbConfiguration.cs
+++ b/Ombi.Store/DbConfiguration.cs
@@ -51,16 +51,20 @@ namespace Ombi.Store
         {
             get
             {
-                if (File.Exists(OldPath))
+
+                if (!string.IsNullOrEmpty(_currentPath))
                 {
-                    _currentPath = OldPath;
+                    return _currentPath;
                 }
 
-                if (File.Exists(NewCurrentPath))
+                if (File.Exists(OldPath))
                 {
-                    _currentPath = NewCurrentPath;
+                    _currentPath = OldPath;
+                    return _currentPath;
                 }
 
+                _currentPath = NewCurrentPath;
+
                 return _currentPath;
             }
         }