diff --git a/src/openforms/js/components/admin/form_design/registrations/json/JSONOptionsForm.js b/src/openforms/js/components/admin/form_design/registrations/json/JSONOptionsForm.js
index 6001a1cacd..9bb72a1974 100644
--- a/src/openforms/js/components/admin/form_design/registrations/json/JSONOptionsForm.js
+++ b/src/openforms/js/components/admin/form_design/registrations/json/JSONOptionsForm.js
@@ -12,7 +12,7 @@ import {
 } from 'components/admin/forms/ValidationErrors';
 import {getChoicesFromSchema} from 'utils/json-schema';
 
-// TODO-4098: maybe create separate file (JSONOptionsFormFields) for all the fields?
+// TODO-4908: maybe create separate file (JSONOptionsFormFields) for all the fields?
 //  Though, no need to use multiple FieldSets, so adding the fields to the form is pretty
 //  straightforward.
 import FormVariablesSelect from './fields/FormVariablesSelect';
@@ -81,7 +81,7 @@ JSONOptionsForm.propTypes = {
   formData: PropTypes.shape({
     service: PropTypes.number,
     relativeApiEndpoint: PropTypes.string,
-    // TODO-4098: might need to rename this to selectedFormVariables to avoid confusion or even
+    // TODO-4908: might need to rename this to selectedFormVariables to avoid confusion or even
     //  naming conflicts
     formVariables: PropTypes.arrayOf(PropTypes.string),
   }),
diff --git a/src/openforms/js/components/admin/form_design/registrations/json/fields/FormVariablesSelect.js b/src/openforms/js/components/admin/form_design/registrations/json/fields/FormVariablesSelect.js
index bd25d1e088..02d3e369be 100644
--- a/src/openforms/js/components/admin/form_design/registrations/json/fields/FormVariablesSelect.js
+++ b/src/openforms/js/components/admin/form_design/registrations/json/fields/FormVariablesSelect.js
@@ -7,7 +7,7 @@ import FormRow from 'components/admin/forms/FormRow';
 import ReactSelect from 'components/admin/forms/ReactSelect';
 
 // TODO-4908: where to add already selected form variables from the variables table?
-// TODO-4098: the select box does not change size when you add more form variables, which causes
+// TODO-4908: the select box does not change size when you add more form variables, which causes
 //  selected form variables to be hidden
 const FormVariablesSelect = ({options}) => {
   const [fieldProps, , fieldHelpers] = useField('formVariables');
diff --git a/src/openforms/registrations/contrib/json/apps.py b/src/openforms/registrations/contrib/json/apps.py
index 533f478116..b7a4e6989b 100644
--- a/src/openforms/registrations/contrib/json/apps.py
+++ b/src/openforms/registrations/contrib/json/apps.py
@@ -2,7 +2,7 @@
 from django.utils.translation import gettext_lazy as _
 
 
-# TODO-4098: maybe rename to FVaJ (Form Variables as JSON)
+# TODO-4908: maybe rename to FVaJ (Form Variables as JSON)
 class JSONConfig(AppConfig):
     name = "openforms.registrations.contrib.json"
     label = "registrations_json"
diff --git a/src/openforms/registrations/contrib/json/config.py b/src/openforms/registrations/contrib/json/config.py
index b7c9567f02..c9970458ec 100644
--- a/src/openforms/registrations/contrib/json/config.py
+++ b/src/openforms/registrations/contrib/json/config.py
@@ -11,6 +11,8 @@
 from openforms.utils.mixins import JsonSchemaSerializerMixin
 
 
+# TODO-4908: when you select a form variable in the configurations and then remove it again,
+#  it is possible to save the plugin and form without validation errors.
 class JSONOptionsSerializer(JsonSchemaSerializerMixin, serializers.Serializer):
     service = PrimaryKeyRelatedAsChoicesField(
         queryset=Service.objects.filter(api_type=APITypes.orc),
@@ -18,7 +20,7 @@ class JSONOptionsSerializer(JsonSchemaSerializerMixin, serializers.Serializer):
         help_text=_("Which service to use."),
         required=True,
     )
-    # TODO-4098: show the complete API endpoint as a (tooltip) hint after user entry?
+    # TODO-4908: show the complete API endpoint as a (tooltip) hint after user entry?
     #  Might be a front-end thing...
     relative_api_endpoint = serializers.CharField(
         max_length=255,
diff --git a/src/openforms/registrations/contrib/json/plugin.py b/src/openforms/registrations/contrib/json/plugin.py
index 5fe6719f13..94f74ee5fc 100644
--- a/src/openforms/registrations/contrib/json/plugin.py
+++ b/src/openforms/registrations/contrib/json/plugin.py
@@ -9,7 +9,6 @@
 
 from ...base import BasePlugin  # openforms.registrations.base
 from ...registry import register  # openforms.registrations.registry
-from ...utils import execute_unless_result_exists
 from .config import JSONOptions, JSONOptionsSerializer
 
 
@@ -64,7 +63,7 @@ def register_submission(self, submission: Submission, options: JSONOptions) -> N
         return json
 
     def check_config(self):
-        # TODO-4098: check if it's possible to connect to the service
+        # TODO-4908: check if it's possible to connect to the service
         #  (using the 'connection check endpoint' of the service)
-        # TODO-4098: check anything else?
+        # TODO-4908: check anything else?
         pass