diff --git a/r4/src/main/java/org/opencds/cqf/r4/providers/LibraryOperationsProvider.java b/r4/src/main/java/org/opencds/cqf/r4/providers/LibraryOperationsProvider.java
index 046b9d5b8..4ae6c34dc 100644
--- a/r4/src/main/java/org/opencds/cqf/r4/providers/LibraryOperationsProvider.java
+++ b/r4/src/main/java/org/opencds/cqf/r4/providers/LibraryOperationsProvider.java
@@ -215,7 +215,7 @@ public Bundle evaluate(@IdParam IdType theId, @OperationParam(name = "patientId"
             IGenericClient client = ClientHelperDos.getClient(resolver.getFhirContext(), dataEndpoint);
             RestFhirRetrieveProvider retriever = new RestFhirRetrieveProvider(new SearchParameterResolver(resolver.getFhirContext()), client);
             retriever.setTerminologyProvider(terminologyProvider);
-            if (terminologyEndpoint != null && !terminologyEndpoint.getAddress().equals(dataEndpoint.getAddress())) {
+            if (terminologyEndpoint == null ||(terminologyEndpoint != null && !terminologyEndpoint.getAddress().equals(dataEndpoint.getAddress()))) {
                 retriever.setExpandValueSets(true);
             }