diff --git a/Duplicati.Library.RestAPI/Serializable/ServerStatus.cs b/Duplicati.Library.RestAPI/Serializable/ServerStatus.cs
index 7b9f9f752..dfe41f5e4 100644
--- a/Duplicati.Library.RestAPI/Serializable/ServerStatus.cs
+++ b/Duplicati.Library.RestAPI/Serializable/ServerStatus.cs
@@ -55,7 +55,7 @@ namespace Duplicati.Server.Serializable
             }
         }
 
-        public string UpdateDownloadLink => FIXMEGlobal.DataConnection.ApplicationSettings.UpdatedVersion.GetUpdateUrls()?.FirstOrDefault();
+        public string UpdateDownloadLink => FIXMEGlobal.DataConnection.ApplicationSettings.UpdatedVersion?.GetUpdateUrls()?.FirstOrDefault();
 
         public UpdatePollerStates UpdaterState { get { return FIXMEGlobal.UpdatePoller.ThreadState; } }
 
diff --git a/Duplicati.Library.RestAPI/WebServer/Server.cs b/Duplicati.Library.RestAPI/WebServer/Server.cs
index 3d72a44b6..04bc5024c 100644
--- a/Duplicati.Library.RestAPI/WebServer/Server.cs
+++ b/Duplicati.Library.RestAPI/WebServer/Server.cs
@@ -260,13 +260,7 @@ namespace Duplicati.Server.WebServer
                 // in the same folders as the running application, to avoid users
                 // that inadvertently expose top level folders
                 if (!string.IsNullOrWhiteSpace(userroot)
-                    &&
-                    (
-                        userroot.StartsWith(Util.AppendDirSeparator(System.Reflection.Assembly.GetExecutingAssembly().Location), Library.Utility.Utility.ClientFilenameStringComparison)
-                        ||
-                        userroot.StartsWith(Util.AppendDirSeparator(Duplicati.Library.AutoUpdater.UpdaterManager.InstalledBaseDir), Library.Utility.Utility.ClientFilenameStringComparison)
-                    )
-                )
+                    && userroot.StartsWith(Util.AppendDirSeparator(Duplicati.Library.Utility.Utility.getEntryAssembly().Location), Library.Utility.Utility.ClientFilenameStringComparison))
 #endif
                 {
                     webroot = userroot;