diff --git a/plugins/apache-airflow/src/api/ApacheAirflowClient.ts b/plugins/apache-airflow/src/api/ApacheAirflowClient.ts
index 976c3b7872..c184e304b4 100644
--- a/plugins/apache-airflow/src/api/ApacheAirflowClient.ts
+++ b/plugins/apache-airflow/src/api/ApacheAirflowClient.ts
@@ -30,13 +30,12 @@ export class ApacheAirflowClient implements ApacheAirflowApi {
   discoveryApi: DiscoveryApi;
   baseUrl: string;
 
-  // TODO - need to better determine how to handle undefined baseUrl
   constructor({
     discoveryApi,
     baseUrl = 'http://localhost:8080',
   }: {
     discoveryApi: DiscoveryApi;
-    baseUrl?: string;
+    baseUrl: string;
   }) {
     this.discoveryApi = discoveryApi;
     this.baseUrl = baseUrl.endsWith('/') ? baseUrl : `${baseUrl}/`;
diff --git a/plugins/apache-airflow/src/plugin.ts b/plugins/apache-airflow/src/plugin.ts
index 60233236f0..04ef1974d4 100644
--- a/plugins/apache-airflow/src/plugin.ts
+++ b/plugins/apache-airflow/src/plugin.ts
@@ -36,7 +36,7 @@ export const apacheAirflowPlugin = createPlugin({
       factory: ({ configApi, discoveryApi }) =>
         new ApacheAirflowClient({
           discoveryApi,
-          baseUrl: configApi.getOptionalString('apacheAirflow.baseUrl'),
+          baseUrl: configApi.getString('apacheAirflow.baseUrl'),
         }),
     }),
   ],