diff --git a/lib/pangea/controllers/my_analytics_controller.dart b/lib/pangea/controllers/my_analytics_controller.dart
index 15079a515..d92c2e48d 100644
--- a/lib/pangea/controllers/my_analytics_controller.dart
+++ b/lib/pangea/controllers/my_analytics_controller.dart
@@ -190,6 +190,7 @@ class MyAnalyticsController extends BaseController {
     );
 
     final uses = tokens
+        .where((token) => token.lemma.saveVocab)
         .map(
           (token) => OneConstructUse(
             useType: useType,
diff --git a/lib/pangea/models/representation_content_model.dart b/lib/pangea/models/representation_content_model.dart
index a318d1831..9fb96f1e9 100644
--- a/lib/pangea/models/representation_content_model.dart
+++ b/lib/pangea/models/representation_content_model.dart
@@ -163,12 +163,15 @@ class PangeaRepresentation {
           ),
         );
       }
-      uses.add(
-        lemma.toVocabUse(
-          inUserL2 ? ConstructUseTypeEnum.wa : ConstructUseTypeEnum.unk,
-          metadata,
-        ),
-      );
+
+      if (lemma.saveVocab) {
+        uses.add(
+          lemma.toVocabUse(
+            inUserL2 ? ConstructUseTypeEnum.wa : ConstructUseTypeEnum.unk,
+            metadata,
+          ),
+        );
+      }
       return uses;
     }
 
@@ -216,12 +219,14 @@ class PangeaRepresentation {
         ),
       );
     }
-    uses.add(
-      lemma.toVocabUse(
-        ConstructUseTypeEnum.wa,
-        metadata,
-      ),
-    );
+    if (lemma.saveVocab) {
+      uses.add(
+        lemma.toVocabUse(
+          ConstructUseTypeEnum.wa,
+          metadata,
+        ),
+      );
+    }
     return uses;
   }
 }