diff --git a/netbox/extras/api/serializers.py b/netbox/extras/api/serializers.py
index 8919f849d..d551e1e8b 100644
--- a/netbox/extras/api/serializers.py
+++ b/netbox/extras/api/serializers.py
@@ -198,7 +198,7 @@ class SavedFilterSerializer(ValidatedModelSerializer):
 class BookmarkSerializer(ValidatedModelSerializer):
     url = serializers.HyperlinkedIdentityField(view_name='extras-api:bookmark-detail')
     object_type = ContentTypeField(
-        queryset=ContentType.objects.all()
+        queryset=ContentType.objects.filter(FeatureQuery('bookmarks').get_query()),
     )
     object = serializers.SerializerMethodField(read_only=True)
     user = NestedUserSerializer()
diff --git a/netbox/extras/forms/model_forms.py b/netbox/extras/forms/model_forms.py
index 27dcaf4cb..354d2a51a 100644
--- a/netbox/extras/forms/model_forms.py
+++ b/netbox/extras/forms/model_forms.py
@@ -173,7 +173,7 @@ class SavedFilterForm(BootstrapMixin, forms.ModelForm):
 class BookmarkForm(BootstrapMixin, forms.ModelForm):
     object_type = ContentTypeChoiceField(
         queryset=ContentType.objects.all(),
-        # limit_choices_to=FeatureQuery('bookmarks').get_query()
+        limit_choices_to=FeatureQuery('bookmarks').get_query()
     )
 
     class Meta:
diff --git a/netbox/netbox/models/features.py b/netbox/netbox/models/features.py
index 3fd1d8369..0928e3f90 100644
--- a/netbox/netbox/models/features.py
+++ b/netbox/netbox/models/features.py
@@ -495,6 +495,7 @@ class SyncedDataMixin(models.Model):
 
 
 FEATURES_MAP = {
+    'bookmarks': BookmarksMixin,
     'custom_fields': CustomFieldsMixin,
     'custom_links': CustomLinksMixin,
     'export_templates': ExportTemplatesMixin,