diff --git a/src/components/Popup/BackupPage.vue b/src/components/Popup/BackupPage.vue
index 41ba0a2e..ce797271 100644
--- a/src/components/Popup/BackupPage.vue
+++ b/src/components/Popup/BackupPage.vue
@@ -71,6 +71,7 @@
 <script lang="ts">
 import Vue from "vue";
 import { isSafari } from "../../browser";
+import { OTPType } from "../../models/otp";
 
 export default Vue.extend({
   data: function () {
@@ -212,25 +213,11 @@ function getOneLineOtpBackupFile(entryData: { [hash: string]: RawOTPStorage }) {
       ? otpStorage.issuer + ":" + (otpStorage.account || "")
       : otpStorage.account || "";
     let type = "";
-    // We may have already have some error OTP type entries in the storage
-    // totp = 1
-    // hotp = 2
-    // battle = 3
-    // steam = 4
-    // hex = 5
-    // hhex = 6
-    if (
-      otpStorage.type === OTPType.totp ||
-      otpStorage.type === OTPType.hex ||
-      (otpStorage.type as unknown) === 1 ||
-      (otpStorage.type as unknown) === 5
-    ) {
+    if (otpStorage.type === OTPType.totp || otpStorage.type === OTPType.hex) {
       type = OTPType.totp;
     } else if (
       otpStorage.type === OTPType.hotp ||
-      otpStorage.type === OTPType.hhex ||
-      (otpStorage.type as unknown) === 2 ||
-      (otpStorage.type as unknown) === 6
+      otpStorage.type === OTPType.hhex
     ) {
       type = OTPType.hotp;
     } else {
diff --git a/src/models/otp.ts b/src/models/otp.ts
index f9de7a0b..c0296abd 100644
--- a/src/models/otp.ts
+++ b/src/models/otp.ts
@@ -117,7 +117,30 @@ export class OTPEntry implements OTPEntryInterface {
       this.secret = entry.secret;
     }
 
-    this.type = entry.type;
+    // We may have already had some error OTP type entries in the storage
+    // totp = 1
+    // hotp = 2
+    // battle = 3
+    // steam = 4
+    // hex = 5
+    // hhex = 6
+
+    if ((entry.type as unknown) === 1) {
+      this.type = OTPType.totp;
+    } else if ((entry.type as unknown) === 2) {
+      this.type = OTPType.hotp;
+    } else if ((entry.type as unknown) === 3) {
+      this.type = OTPType.battle;
+    } else if ((entry.type as unknown) === 4) {
+      this.type = OTPType.steam;
+    } else if ((entry.type as unknown) === 5) {
+      this.type = OTPType.hex;
+    } else if ((entry.type as unknown) === 6) {
+      this.type = OTPType.hhex;
+    } else {
+      this.type = entry.type;
+    }
+
     if (entry.issuer) {
       this.issuer = entry.issuer;
     } else {
@@ -225,6 +248,30 @@ export class OTPEntry implements OTPEntryInterface {
     this.secret = decryptedData.secret;
     this.type = decryptedData.type || OTPType.totp;
 
+    // We may have already had some error OTP type entries in the storage
+    // totp = 1
+    // hotp = 2
+    // battle = 3
+    // steam = 4
+    // hex = 5
+    // hhex = 6
+
+    if ((decryptedData.type as unknown) === 1) {
+      this.type = OTPType.totp;
+    } else if ((decryptedData.type as unknown) === 2) {
+      this.type = OTPType.hotp;
+    } else if ((decryptedData.type as unknown) === 3) {
+      this.type = OTPType.battle;
+    } else if ((decryptedData.type as unknown) === 4) {
+      this.type = OTPType.steam;
+    } else if ((decryptedData.type as unknown) === 5) {
+      this.type = OTPType.hex;
+    } else if ((decryptedData.type as unknown) === 6) {
+      this.type = OTPType.hhex;
+    } else {
+      this.type = OTPType.totp;
+    }
+
     if (this.type !== OTPType.hotp && this.type !== OTPType.hhex) {
       this.generate();
     }
diff --git a/src/models/storage.ts b/src/models/storage.ts
index fd78ab67..e0527973 100644
--- a/src/models/storage.ts
+++ b/src/models/storage.ts
@@ -630,8 +630,32 @@ export class EntryStorage {
         default:
           // we need correct the type here
           // and save it
-          type = OTPType.totp;
-          entryData.type = OTPType.totp;
+
+          // We may have already had some error OTP type entries in the storage
+          // totp = 1
+          // hotp = 2
+          // battle = 3
+          // steam = 4
+          // hex = 5
+          // hhex = 6
+
+          if ((entryData.type as unknown) === 1) {
+            type = OTPType.totp;
+          } else if ((entryData.type as unknown) === 2) {
+            type = OTPType.hotp;
+          } else if ((entryData.type as unknown) === 3) {
+            type = OTPType.battle;
+          } else if ((entryData.type as unknown) === 4) {
+            type = OTPType.steam;
+          } else if ((entryData.type as unknown) === 5) {
+            type = OTPType.hex;
+          } else if ((entryData.type as unknown) === 6) {
+            type = OTPType.hhex;
+          } else {
+            type = OTPType.totp;
+          }
+
+          entryData.type = type;
       }
 
       let period: number | undefined;