diff --git a/Fab2ApprovalSystem/Models/AppSettings.cs b/Fab2ApprovalSystem/Models/AppSettings.cs
index d34d2b4..b193aca 100644
--- a/Fab2ApprovalSystem/Models/AppSettings.cs
+++ b/Fab2ApprovalSystem/Models/AppSettings.cs
@@ -8,7 +8,7 @@ namespace Fab2ApprovalSystem.Models;
 public class AppSettings {
 
     public AppSettings(string adminNotificationRecepient,
-                       string? apiBaseUrl,
+                       string apiBaseUrl,
                        string attachmentFolder,
                        string? attachmentUrl,
                        string caBlankFormsLocation,
@@ -94,7 +94,7 @@ public class AppSettings {
     }
 
     public string AdminNotificationRecepient { get; }
-    public string? ApiBaseUrl { get; }
+    public string ApiBaseUrl { get; }
     public string AttachmentFolder { get; }
     public string? AttachmentUrl { get; }
     public string CABlankFormsLocation { get; }
@@ -214,7 +214,8 @@ public class AppSettings {
                 throw new ArgumentNullException("SSRSPassword environment variable not found");
             string testEmailRecipients = ConfigurationManager.AppSettings["Test Email Recipients"] ??
                 throw new ArgumentNullException("Test Email Recipients environment variable not found");
-            string? apiBaseUrl = ConfigurationManager.AppSettings["FabApprovalApiBaseUrl"]?.ToString();
+            string apiBaseUrl = Environment.GetEnvironmentVariable("FabApprovalApiBaseUrl") ??
+                throw new ArgumentNullException("FabApprovalApiBaseUrl environment variable not found");
             string? attachmentUrl = ConfigurationManager.AppSettings["AttachmentUrl"]?.ToString();
             string? company = ConfigurationManager.AppSettings["Company"]?.ToString();
             string? smtpServer = ConfigurationManager.AppSettings["SMTP Server"]?.ToString();