diff --git a/src/c3nav/editor/migrations/0006_alter_changeset_author_alter_changesetupdate_user.py b/src/c3nav/editor/migrations/0006_alter_changeset_author_alter_changesetupdate_user.py
new file mode 100644
index 00000000..60531e1c
--- /dev/null
+++ b/src/c3nav/editor/migrations/0006_alter_changeset_author_alter_changesetupdate_user.py
@@ -0,0 +1,26 @@
+# Generated by Django 5.0.8 on 2024-12-26 01:06
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('editor', '0005_alter_changeset_changes_alter_changeset_description'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='changeset',
+            name='author',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='Author'),
+        ),
+        migrations.AlterField(
+            model_name='changesetupdate',
+            name='user',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL),
+        ),
+    ]
diff --git a/src/c3nav/editor/models/changeset.py b/src/c3nav/editor/models/changeset.py
index aba060ae..2fed6edd 100644
--- a/src/c3nav/editor/models/changeset.py
+++ b/src/c3nav/editor/models/changeset.py
@@ -41,7 +41,7 @@ class ChangeSet(models.Model):
     last_state_update = models.ForeignKey('editor.ChangeSetUpdate', null=True, related_name='+',
                                           verbose_name=_('last state update'), on_delete=models.CASCADE)
     state = models.CharField(max_length=20, db_index=True, choices=STATES, default='unproposed')
-    author = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT, verbose_name=_('Author'))
+    author = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.SET_NULL, verbose_name=_('Author'))
     title = models.CharField(max_length=100, default='', verbose_name=_('Title'))
     description = models.TextField(max_length=1000, default='', verbose_name=_('Description'), blank=True)
     assigned_to = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT,
diff --git a/src/c3nav/editor/models/changesetupdate.py b/src/c3nav/editor/models/changesetupdate.py
index 2dd90f3c..cf738eac 100644
--- a/src/c3nav/editor/models/changesetupdate.py
+++ b/src/c3nav/editor/models/changesetupdate.py
@@ -11,7 +11,7 @@ class ChangeSetUpdate(models.Model):
     changeset = models.ForeignKey(ChangeSet, on_delete=models.CASCADE, related_name='updates')
     datetime = models.DateTimeField(auto_now_add=True, verbose_name=_('datetime'))
     comment = models.TextField(max_length=1000, null=True)
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.PROTECT, related_name='+')
+    user = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, on_delete=models.SET_NULL, related_name='+')
 
     state = models.CharField(null=None, db_index=True, choices=ChangeSet.STATES, max_length=20)
     title = models.CharField(max_length=100, null=True)