diff --git a/synapse/storage/schema/delta/34/device_outbox.sql b/synapse/storage/schema/delta/35/device_outbox.sql
similarity index 83%
rename from synapse/storage/schema/delta/34/device_outbox.sql
rename to synapse/storage/schema/delta/35/device_outbox.sql
index e87066d9a..17e6c4310 100644
--- a/synapse/storage/schema/delta/34/device_outbox.sql
+++ b/synapse/storage/schema/delta/35/device_outbox.sql
@@ -13,6 +13,7 @@
  * limitations under the License.
  */
 
+DROP TABLE IF EXISTS device_federation_outbox;
 CREATE TABLE device_federation_outbox (
     destination TEXT NOT NULL,
     stream_id BIGINT NOT NULL,
@@ -21,16 +22,18 @@ CREATE TABLE device_federation_outbox (
 );
 
 
+DROP INDEX IF EXISTS device_federation_outbox_destination_id;
 CREATE INDEX device_federation_outbox_destination_id
     ON device_federation_outbox(destination, stream_id);
 
 
+DROP TABLE IF EXISTS device_federation_inbox;
 CREATE TABLE device_federation_inbox (
     origin TEXT NOT NULL,
     message_id TEXT NOT NULL,
     received_ts BIGINT NOT NULL
 );
 
-
+DROP INDEX IF EXISTS device_federation_inbox_sender_id;
 CREATE INDEX device_federation_inbox_sender_id
     ON device_federation_inbox(origin, message_id);