diff --git a/src/server/Controllers/EntityController.cs b/src/server/Controllers/EntityController.cs
index 528c5bb..21d29ee 100644
--- a/src/server/Controllers/EntityController.cs
+++ b/src/server/Controllers/EntityController.cs
@@ -55,7 +55,7 @@ public class EntityController : ControllerBase
     }
 
     [HttpGet("List")]
-    public ActionResult<EntityListResults> List(string searchdomain)
+    public ActionResult<EntityListResults> List(string searchdomain, bool returnEmbeddings = false)
     {
         EntityListResults entityListResults = new() {Results = []};
         Searchdomain searchdomain_ = _domainManager.GetSearchdomain(searchdomain);
@@ -69,12 +69,19 @@ public class EntityController : ControllerBase
             List<DatapointResult> datapointResults = [];
             foreach (Datapoint datapoint in entity.datapoints)
             {
-                List<EmbeddingResult> embeddingResults = [];
-                foreach ((string, float[]) embedding in datapoint.embeddings)
+                if (returnEmbeddings)
                 {
-                    embeddingResults.Add(new EmbeddingResult() {Model = embedding.Item1, Embeddings = embedding.Item2});
+                    List<EmbeddingResult> embeddingResults = [];
+                    foreach ((string, float[]) embedding in datapoint.embeddings)
+                    {
+                        embeddingResults.Add(new EmbeddingResult() {Model = embedding.Item1, Embeddings = embedding.Item2});
+                    }
+                    datapointResults.Add(new DatapointResult() {Name = datapoint.name, ProbMethod = datapoint.probMethod.Method.Name, Embeddings = embeddingResults});
+                }
+                else
+                {
+                    datapointResults.Add(new DatapointResult() {Name = datapoint.name, ProbMethod = datapoint.probMethod.Method.Name, Embeddings = null});
                 }
-                datapointResults.Add(new DatapointResult() {Name = datapoint.name, ProbMethod = datapoint.probMethod.Method.Name, Embeddings = embeddingResults});
             }
             EntityListResult entityListResult = new()
             {
diff --git a/src/server/Models/EntityModels.cs b/src/server/Models/EntityModels.cs
index 573bf8d..ffc5b33 100644
--- a/src/server/Models/EntityModels.cs
+++ b/src/server/Models/EntityModels.cs
@@ -39,7 +39,7 @@ public class DatapointResult
 {
     public required string Name { get; set; }
     public required string ProbMethod { get; set; }
-    public required List<EmbeddingResult> Embeddings { get; set; } 
+    public required List<EmbeddingResult>? Embeddings { get; set; } 
 }
 
 public class EmbeddingResult