diff --git a/src/database.rs b/src/database.rs
index 5205b9ca..5b2e8a5c 100644
--- a/src/database.rs
+++ b/src/database.rs
@@ -997,6 +997,14 @@ impl KeyValueDatabase {
                 Ok(())
             })?;
 
+            // Hack to ignore conduit's 13->16 migration. This is fine because
+            // the migration is idempotent, so it will just be run a second time
+            // as a no-op when switching from grapevine to conduit.
+            if services().globals.database_version().unwrap() == 16 {
+                services().globals.bump_database_version(13)?;
+                warn!("Reverted: 16 -> 13");
+            }
+
             assert_eq!(
                 services().globals.database_version().unwrap(),
                 latest_database_version,