diff --git a/bookwyrm/templates/book/edit_book.html b/bookwyrm/templates/book/edit_book.html
index 8cf6f31c..0cde8dff 100644
--- a/bookwyrm/templates/book/edit_book.html
+++ b/bookwyrm/templates/book/edit_book.html
@@ -124,7 +124,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_first_published_date">{% trans "First published date:" %}</label>
-                    <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if book.first_published_date %} value="{{ book.first_published_date|date:'Y-m-d' }}"{% elif form.first_published_date.value %} value="{{ form.first_published_date.value }}"{% endif %}>
+                    <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %}>
                 </p>
                 {% for error in form.first_published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
@@ -132,7 +132,7 @@
 
                 <p class="mb-2">
                     <label class="label" for="id_published_date">{% trans "Published date:" %}</label>
-                    <input type="date" name="published_date" class="input" id="id_published_date"{% if book.published_date %} value="{{ book.published_date|date:'Y-m-d' }}"{% elif form.published_date.value %} value="{{ form.first_published_date.value }}"{% endif %}>
+                    <input type="date" name="published_date" class="input" id="id_published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d'}}"{% endif %}>
                 </p>
                 {% for error in form.published_date.errors %}
                 <p class="help is-danger">{{ error | escape }}</p>
diff --git a/bookwyrm/views/books.py b/bookwyrm/views/books.py
index 58886cad..e982a7d3 100644
--- a/bookwyrm/views/books.py
+++ b/bookwyrm/views/books.py
@@ -1,4 +1,5 @@
 """ the good stuff! the books! """
+from datetime import datetime
 from uuid import uuid4
 
 from django.contrib.auth.decorators import login_required, permission_required
@@ -172,6 +173,12 @@ class EditBook(View):
             data["confirm_mode"] = True
             # this isn't preserved because it isn't part of the form obj
             data["remove_authors"] = request.POST.getlist("remove_authors")
+            # we have to make sure the dates are passed in as datetime, they're currently a string
+            # QueryDicts are immutable, we need to copy
+            formcopy = data["form"].data.copy()
+            formcopy["first_published_date"] = datetime.strptime(formcopy["first_published_date"], "%Y-%m-%d")
+            formcopy["published_date"] = datetime.strptime(formcopy["published_date"], "%Y-%m-%d")
+            data["form"].data = formcopy
             return TemplateResponse(request, "book/edit_book.html", data)
 
         remove_authors = request.POST.getlist("remove_authors")