diff --git a/src/pretix/base/i18n.py b/src/pretix/base/i18n.py
index 5cac61d53d..4d32ab7112 100644
--- a/src/pretix/base/i18n.py
+++ b/src/pretix/base/i18n.py
@@ -62,7 +62,7 @@ class I18nWidget(forms.MultiWidget):
                 if value is not None and isinstance(value.data, dict) and lng in value.data
                 else None
             )
-        if not isinstance(value.data, dict):
+        if value and not isinstance(value.data, dict):
             data[0] = value.data
         return data
 
diff --git a/src/tests/control/test_items.py b/src/tests/control/test_items.py
index e1917b9d0a..c7a17ed1a5 100644
--- a/src/tests/control/test_items.py
+++ b/src/tests/control/test_items.py
@@ -37,7 +37,7 @@ class CategoriesTest(ItemFormTest):
         self.driver.get('%s/control/event/%s/%s/categories/add' % (
             self.live_server_url, self.orga1.slug, self.event1.slug
         ))
-        self.driver.find_element_by_name("name").send_keys('Entry tickets')
+        self.driver.find_element_by_name("name_0").send_keys('Entry tickets')
         self.driver.find_element_by_class_name("btn-save").click()
         self.driver.find_element_by_class_name("alert-success")
         self.assertIn("Entry tickets", self.driver.find_element_by_css_selector("#page-wrapper table").text)
@@ -47,8 +47,8 @@ class CategoriesTest(ItemFormTest):
         self.driver.get('%s/control/event/%s/%s/categories/%s/' % (
             self.live_server_url, self.orga1.slug, self.event1.slug, c.identity
         ))
-        self.driver.find_element_by_name("name").clear()
-        self.driver.find_element_by_name("name").send_keys('T-Shirts')
+        self.driver.find_element_by_name("name_0").clear()
+        self.driver.find_element_by_name("name_0").send_keys('T-Shirts')
         self.scroll_and_click(self.driver.find_element_by_class_name("btn-save"))
         self.driver.find_element_by_class_name("alert-success")
         self.assertIn("T-Shirts", self.driver.find_element_by_css_selector("#page-wrapper table").text)