diff --git a/bothub/api/v2/repository/serializers.py b/bothub/api/v2/repository/serializers.py
index e96e6085..30b6b615 100644
--- a/bothub/api/v2/repository/serializers.py
+++ b/bothub/api/v2/repository/serializers.py
@@ -1271,7 +1271,8 @@ class Meta:
         style={"show": False},
     )
     language = serializers.ChoiceField(
-        languages.LANGUAGE_CHOICES, allow_blank=True, required=False
+        languages.LANGUAGE_CHOICES, allow_blank=True, required=False,
+        # [language[0] for language in languages.LANGUAGE_CHOICES], allow_blank=True, required=False,
     )
 
     entities = RepositoryExampleEntitySerializer(
@@ -1347,12 +1348,16 @@ def create(self, validated_data):
         return example
 
     def update(self, instance, validated_data):
-        entities_data = validated_data.pop("entities")
-        validated_data.pop("repository")
-        validated_data.pop("repository_version_language")
-        # validated_data.pop("language", None)
+        entities_data = validated_data.pop("entities", None)
+        validated_data.pop("repository", None)
+        validated_data.pop("repository_version_language", None)
+        language = validated_data.pop("language", None)
         intent_text = validated_data.get("intent", None)
 
+        if language:
+            repository_version_language = instance.repository_version_language.repository_version.repository.current_version(language)
+            validated_data.update({"repository_version_language": repository_version_language})
+
         if intent_text:
             intent, created = RepositoryIntent.objects.get_or_create(
                 repository_version=instance.repository_version_language.repository_version,