diff --git a/src/Microsoft.OpenApi/Reader/Services/DefaultStreamLoader.cs b/src/Microsoft.OpenApi/Reader/Services/DefaultStreamLoader.cs
index dba3c6811..71e26709e 100644
--- a/src/Microsoft.OpenApi/Reader/Services/DefaultStreamLoader.cs
+++ b/src/Microsoft.OpenApi/Reader/Services/DefaultStreamLoader.cs
@@ -56,7 +56,16 @@ public Stream Load(Uri uri)
///
public async Task LoadAsync(Uri uri)
{
- var absoluteUri = new Uri(baseUrl, uri);
+ Uri absoluteUri;
+ if (baseUrl.Equals(OpenApiConstants.BaseRegistryUri))
+ {
+ // use current working directory
+ absoluteUri = new Uri(Directory.GetCurrentDirectory() + uri);
+ }
+ else
+ {
+ absoluteUri = new Uri(baseUrl, uri);
+ }
switch (absoluteUri.Scheme)
{