diff --git a/migrations/0023__remove_id_from_note_history.sql b/migrations/0023__remove_id_from_note_history.sql
new file mode 100644
index 000000000..01902b57c
--- /dev/null
+++ b/migrations/0023__remove_id_from_note_history.sql
@@ -0,0 +1,27 @@
+CREATE TABLE `notes_history_mig` (
+	`note_history_id`	TEXT NOT NULL PRIMARY KEY,
+	`note_id`	TEXT NOT NULL,
+	`note_title`	TEXT,
+	`note_text`	TEXT,
+	`encryption`	INT,
+	`date_modified_from` INT,
+	`date_modified_to` INT
+);
+
+INSERT INTO notes_history_mig (note_history_id, note_id, note_title, note_text, encryption, date_modified_from, date_modified_to)
+    SELECT note_history_id, note_id, note_title, note_text, encryption, date_modified_from, date_modified_to FROM notes_history;
+
+DROP TABLE notes_history;
+ALTER TABLE notes_history_mig RENAME TO notes_history;
+
+CREATE INDEX `IDX_notes_history_note_id` ON `notes_history` (
+	`note_id`
+);
+
+CREATE INDEX `IDX_notes_history_note_date_modified_from` ON `notes_history` (
+	`date_modified_from`
+);
+
+CREATE INDEX `IDX_notes_history_note_date_modified_to` ON `notes_history` (
+	`date_modified_to`
+);
\ No newline at end of file
diff --git a/services/migration.js b/services/migration.js
index 25db3109a..16c7c5b08 100644
--- a/services/migration.js
+++ b/services/migration.js
@@ -3,7 +3,7 @@ const sql = require('./sql');
 const fs = require('fs-extra');
 const log = require('./log');
 
-const APP_DB_VERSION = 22;
+const APP_DB_VERSION = 23;
 const MIGRATIONS_DIR = "./migrations";
 
 async function migrate() {
diff --git a/services/sync.js b/services/sync.js
index 299869058..a1cad9129 100644
--- a/services/sync.js
+++ b/services/sync.js
@@ -285,8 +285,6 @@ async function updateNoteHistory(entity, sourceId, syncLog) {
 
     if (orig === null || orig.date_modified_to < entity.date_modified_to) {
         await sql.doInTransaction(async () => {
-            delete entity['id'];
-
             await sql.replace('notes_history', entity);
 
             await sql.addNoteHistorySync(entity.note_history_id, sourceId);