diff --git a/plugin/cpg/src/main/java/org/opencds/cqf/ruler/cpg/CqlEvaluationHelper.java b/plugin/cpg/src/main/java/org/opencds/cqf/ruler/cpg/CqlEvaluationHelper.java
index 0e27b1816..8d67a1c65 100644
--- a/plugin/cpg/src/main/java/org/opencds/cqf/ruler/cpg/CqlEvaluationHelper.java
+++ b/plugin/cpg/src/main/java/org/opencds/cqf/ruler/cpg/CqlEvaluationHelper.java
@@ -187,9 +187,7 @@ private void setupDataProvider(DaoRegistry daoRegistry) {
 			this.queryGenerator.setExpandValueSets(true);
 			restRetriever.setFhirQueryGenerator(queryGenerator);
 			restRetriever.setTerminologyProvider(terminologyProvider);
-			if (terminologyEndpoint != null) {
-				restRetriever.setExpandValueSets(true);
-			}
+			restRetriever.setExpandValueSets(true);
 			retrieveProviders.add(restRetriever);
 		}
 		dataProvider = new CompositeDataProvider(modelResolver, new PriorityRetrieveProvider(retrieveProviders));