diff --git a/module/data/countdowns.mjs b/module/data/countdowns.mjs
index 8e55ed31..ffe4d26b 100644
--- a/module/data/countdowns.mjs
+++ b/module/data/countdowns.mjs
@@ -28,6 +28,39 @@ export default class DhCountdowns extends foundry.abstract.DataModel {
         for (const countdownKey of changedCountdowns)
             foundry.ui.countdowns.changedCountdownsForAnimation.add(countdownKey);
     }
+
+    static migrateData(source) {
+        const migrateOldCountdowns = (data, type) => {
+            for (const key of Object.keys(data.countdowns)) {
+                const countdown = data.countdowns[key];
+                source.countdowns[key] = {
+                    ...countdown,
+                    type: type,
+                    ownership: Object.keys(countdown.ownership.players).reduce((acc, key) => {
+                        acc[key] =
+                            countdown.ownership.players[key].type === 1 ? 2 : countdown.ownership.players[key].type;
+                        return acc;
+                    }, {}),
+                    progress: {
+                        ...countdown.progress,
+                        type: countdown.progress.type.value
+                    }
+                };
+            }
+
+            source[type] = null;
+        };
+
+        if (source.narrative) {
+            migrateOldCountdowns(source.narrative, 'narrative');
+        }
+
+        if (source.encounter) {
+            migrateOldCountdowns(source.encounter, 'encounter');
+        }
+
+        return super.migrateData(source);
+    }
 }
 
 export class DhCountdown extends foundry.abstract.DataModel {
diff --git a/module/systemRegistration/migrations.mjs b/module/systemRegistration/migrations.mjs
index 1e5d977a..de4ce350 100644
--- a/module/systemRegistration/migrations.mjs
+++ b/module/systemRegistration/migrations.mjs
@@ -1,5 +1,4 @@
 import { defaultRestOptions } from '../config/generalConfig.mjs';
-import { RefreshType, socketEvent } from './socket.mjs';
 
 export async function runMigrations() {
     let lastMigrationVersion = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LastMigrationVersion);
@@ -153,45 +152,6 @@ export async function runMigrations() {
             await pack.configure({ locked: true });
         }
 
-        /* Migrate old countdown structure */
-        const countdownSettings = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns);
-        if (!countdownSettings.narrative || !countdownSettings.encounter) {
-            const getCountdowns = (data, type) => {
-                return Object.keys(data.countdowns).reduce((acc, key) => {
-                    const countdown = data.countdowns[key];
-                    acc[key] = {
-                        ...countdown,
-                        type: type,
-                        ownership: Object.keys(countdown.ownership.players).reduce((acc, key) => {
-                            acc[key] =
-                                countdown.ownership.players[key].type === 1 ? 2 : countdown.ownership.players[key].type;
-                            return acc;
-                        }, {}),
-                        progress: {
-                            ...countdown.progress,
-                            type: countdown.progress.type.value
-                        }
-                    };
-
-                    return acc;
-                }, {});
-            };
-
-            await countdownSettings.updateSource({
-                countdowns: {
-                    ...getCountdowns(countdownSettings.narrative, 'narrative'),
-                    ...getCountdowns(countdownSettings.encounter, 'encounter')
-                }
-            });
-            await game.settings.set(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.Countdowns, countdownSettings);
-
-            game.socket.emit(`system.${CONFIG.DH.id}`, {
-                action: socketEvent.Refresh,
-                data: { refreshType: RefreshType.Countdown }
-            });
-            Hooks.callAll(socketEvent.Refresh, { refreshType: RefreshType.Countdown });
-        }
-        
         lastMigrationVersion = '1.2.0';
     }