diff --git a/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/client/TerminologyServerClient.java b/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/client/TerminologyServerClient.java
index a873ca72f..25087ac14 100644
--- a/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/client/TerminologyServerClient.java
+++ b/cqf-fhir-utility/src/main/java/org/opencds/cqf/fhir/utility/client/TerminologyServerClient.java
@@ -21,11 +21,28 @@ public org.hl7.fhir.dstu3.model.ValueSet expand(
             String apiKey) {
         IGenericClient fhirClient = ctx.newRestfulGenericClient(getAuthoritativeSourceBase(authoritativeSource));
         Clients.registerAdditionalRequestHeadersAuth(fhirClient, username, apiKey);
-
-        // Invoke by Value Set ID
+        if (expansionParameters == null) {
+            expansionParameters = new org.hl7.fhir.dstu3.model.Parameters();
+        }
+        if (!expansionParameters.getParameter().stream()
+                .anyMatch(p -> p.getName().equals("url"))) {
+            expansionParameters
+                    .addParameter()
+                    .setName("url")
+                    .setValue(new org.hl7.fhir.dstu3.model.UriType(valueSet.getUrl()));
+        }
+        if (valueSet.hasVersion()
+                && !expansionParameters.getParameter().stream()
+                        .anyMatch(p -> p.getName().equals("valueSetVersion"))) {
+            expansionParameters
+                    .addParameter()
+                    .setName("valueSetVersion")
+                    .setValue(new org.hl7.fhir.dstu3.model.StringType(valueSet.getVersion()));
+        }
+        // Invoke on the type using the url parameter
         return fhirClient
                 .operation()
-                .onInstance(valueSet.getId())
+                .onType("ValueSet")
                 .named("$expand")
                 .withParameters(expansionParameters)
                 .returnResourceType(org.hl7.fhir.dstu3.model.ValueSet.class)
@@ -40,11 +57,20 @@ public org.hl7.fhir.r4.model.ValueSet expand(
             String apiKey) {
         IGenericClient fhirClient = ctx.newRestfulGenericClient(getAuthoritativeSourceBase(authoritativeSource));
         Clients.registerAdditionalRequestHeadersAuth(fhirClient, username, apiKey);
-
-        // Invoke by Value Set ID
+        if (expansionParameters == null) {
+            expansionParameters = new org.hl7.fhir.r4.model.Parameters();
+        }
+        if (!expansionParameters.hasParameter("url")) {
+            expansionParameters.addParameter("url", new org.hl7.fhir.r4.model.UriType(valueSet.getUrl()));
+        }
+        if (valueSet.hasVersion() && !expansionParameters.hasParameter("valueSetVersion")) {
+            expansionParameters.addParameter(
+                    "valueSetVersion", new org.hl7.fhir.r4.model.StringType(valueSet.getVersion()));
+        }
+        // Invoke on the type using the url parameter
         return fhirClient
                 .operation()
-                .onInstance(valueSet.getId())
+                .onType("ValueSet")
                 .named("$expand")
                 .withParameters(expansionParameters)
                 .returnResourceType(org.hl7.fhir.r4.model.ValueSet.class)
@@ -60,10 +86,20 @@ public org.hl7.fhir.r5.model.ValueSet expand(
         IGenericClient fhirClient = ctx.newRestfulGenericClient(getAuthoritativeSourceBase(authoritativeSource));
         Clients.registerAdditionalRequestHeadersAuth(fhirClient, username, apiKey);
 
-        // Invoke by Value Set ID
+        if (expansionParameters == null) {
+            expansionParameters = new org.hl7.fhir.r5.model.Parameters();
+        }
+        if (!expansionParameters.hasParameter("url")) {
+            expansionParameters.addParameter("url", new org.hl7.fhir.r5.model.UriType(valueSet.getUrl()));
+        }
+        if (valueSet.hasVersion() && !expansionParameters.hasParameter("valueSetVersion")) {
+            expansionParameters.addParameter(
+                    "valueSetVersion", new org.hl7.fhir.r5.model.StringType(valueSet.getVersion()));
+        }
+        // Invoke on the type using the url parameter
         return fhirClient
                 .operation()
-                .onInstance(valueSet.getId())
+                .onType("ValueSet")
                 .named("$expand")
                 .withParameters(expansionParameters)
                 .returnResourceType(org.hl7.fhir.r5.model.ValueSet.class)
diff --git a/cqf-fhir-utility/src/test/java/org/opencds/cqf/fhir/utility/client/TerminologyServerClientTest.java b/cqf-fhir-utility/src/test/java/org/opencds/cqf/fhir/utility/client/TerminologyServerClientTest.java
new file mode 100644
index 000000000..565a67392
--- /dev/null
+++ b/cqf-fhir-utility/src/test/java/org/opencds/cqf/fhir/utility/client/TerminologyServerClientTest.java
@@ -0,0 +1,149 @@
+package org.opencds.cqf.fhir.utility.client;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.rest.client.impl.GenericClient;
+import org.junit.jupiter.api.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.internal.stubbing.defaultanswers.ReturnsDeepStubs;
+
+public class TerminologyServerClientTest {
+    private static final String url = "www.test.com";
+    private static final String version = "1.0";
+    private static final String authoritativeSource = "www.source.com/ValueSet";
+    private static final String username = "username";
+    private static final String password = "password";
+    private static final String urlParamName = "url";
+    private static final String versionParamName = "valueSetVersion";
+
+    @Test
+    void testR4UrlAndVersion() {
+        var vs = new org.hl7.fhir.r4.model.ValueSet();
+        vs.setUrl(url);
+        var capt = ArgumentCaptor.forClass(org.hl7.fhir.r4.model.Parameters.class);
+        var clientMock = mock(GenericClient.class, new ReturnsDeepStubs());
+        var contextMock = mock(FhirContext.class);
+        when(contextMock.newRestfulGenericClient(any())).thenReturn(clientMock);
+        when(clientMock
+                        .operation()
+                        .onType(anyString())
+                        .named(anyString())
+                        .withParameters(capt.capture())
+                        .returnResourceType(any())
+                        .execute())
+                .thenReturn(vs);
+
+        var client = new TerminologyServerClient(contextMock);
+        client.expand(vs, authoritativeSource, new org.hl7.fhir.r4.model.Parameters(), username, password);
+        assertNotNull(capt.getValue());
+        var params = capt.getValue();
+        assertEquals(
+                url,
+                ((org.hl7.fhir.r4.model.UriType)
+                                params.getParameter(urlParamName).getValue())
+                        .getValue());
+        assertNull(params.getParameter(versionParamName));
+
+        // when the valueset has a version it should be in params
+        vs.setVersion(version);
+        client.expand(vs, authoritativeSource, new org.hl7.fhir.r4.model.Parameters(), username, password);
+        params = capt.getAllValues().get(1);
+        assertEquals(
+                version,
+                ((org.hl7.fhir.r4.model.StringType)
+                                params.getParameter(versionParamName).getValue())
+                        .getValue());
+    }
+
+    @Test
+    void testR5UrlAndVersion() {
+        var vs = new org.hl7.fhir.r5.model.ValueSet();
+        vs.setUrl(url);
+        var capt = ArgumentCaptor.forClass(org.hl7.fhir.r5.model.Parameters.class);
+        var clientMock = mock(GenericClient.class, new ReturnsDeepStubs());
+        var contextMock = mock(FhirContext.class);
+        when(contextMock.newRestfulGenericClient(any())).thenReturn(clientMock);
+        when(clientMock
+                        .operation()
+                        .onType(anyString())
+                        .named(anyString())
+                        .withParameters(capt.capture())
+                        .returnResourceType(any())
+                        .execute())
+                .thenReturn(vs);
+
+        var client = new TerminologyServerClient(contextMock);
+        client.expand(vs, authoritativeSource, new org.hl7.fhir.r5.model.Parameters(), username, password);
+        assertNotNull(capt.getValue());
+        var params = capt.getValue();
+        assertEquals(
+                url,
+                ((org.hl7.fhir.r5.model.UriType)
+                                params.getParameter(urlParamName).getValue())
+                        .getValue());
+        assertNull(params.getParameter(versionParamName));
+
+        // when the valueset has a version it should be in params
+        vs.setVersion(version);
+        client.expand(vs, authoritativeSource, new org.hl7.fhir.r5.model.Parameters(), username, password);
+        params = capt.getAllValues().get(1);
+        assertEquals(
+                version,
+                ((org.hl7.fhir.r5.model.StringType)
+                                params.getParameter(versionParamName).getValue())
+                        .getValue());
+    }
+
+    @Test
+    void testDstu3UrlAndVersion() {
+        var vs = new org.hl7.fhir.dstu3.model.ValueSet();
+        vs.setUrl(url);
+        var capt = ArgumentCaptor.forClass(org.hl7.fhir.dstu3.model.Parameters.class);
+        var clientMock = mock(GenericClient.class, new ReturnsDeepStubs());
+        var contextMock = mock(FhirContext.class);
+        when(contextMock.newRestfulGenericClient(any())).thenReturn(clientMock);
+        when(clientMock
+                        .operation()
+                        .onType(anyString())
+                        .named(anyString())
+                        .withParameters(capt.capture())
+                        .returnResourceType(any())
+                        .execute())
+                .thenReturn(vs);
+
+        var client = new TerminologyServerClient(contextMock);
+        client.expand(vs, authoritativeSource, new org.hl7.fhir.dstu3.model.Parameters(), username, password);
+        assertNotNull(capt.getValue());
+        var params = capt.getValue();
+        assertEquals(
+                url,
+                ((org.hl7.fhir.dstu3.model.UriType) params.getParameter().stream()
+                                .filter(p -> p.getName().equals(urlParamName))
+                                .findAny()
+                                .orElseThrow()
+                                .getValue())
+                        .getValue());
+        assertTrue(!params.getParameter().stream().anyMatch(p -> p.getName().equals(versionParamName)));
+
+        // when the valueset has a version it should be in params
+        vs.setVersion(version);
+        client.expand(vs, authoritativeSource, new org.hl7.fhir.dstu3.model.Parameters(), username, password);
+        params = capt.getAllValues().get(1);
+        assertEquals(
+                version,
+                ((org.hl7.fhir.dstu3.model.StringType) params.getParameter().stream()
+                                .filter(p -> p.getName().equals(versionParamName))
+                                .findFirst()
+                                .orElseThrow()
+                                .getValue())
+                        .getValue());
+    }
+}