diff --git a/src/models/storage.ts b/src/models/storage.ts
index 4b3699fb..b22c0eeb 100644
--- a/src/models/storage.ts
+++ b/src/models/storage.ts
@@ -463,7 +463,9 @@ export class EntryStorage {
         continue;
       }
 
+      const rawType = data[hash].type;
       const rawAlgorithm = data[hash].algorithm;
+
       const entryData: {
         account: string;
         encrypted: false;
@@ -478,7 +480,7 @@ export class EntryStorage {
         algorithm: OTPAlgorithm;
         pinned: boolean;
       } = {
-        type: (parseInt(data[hash].type) as OTPType) || OTPType[OTPType.totp],
+        type: OTPType[rawType] || OTPType[OTPType.totp],
         index: data[hash].index || 0,
         issuer: data[hash].issuer || "",
         account: data[hash].account || "",
@@ -488,7 +490,7 @@ export class EntryStorage {
         period: data[hash].period || 30,
         digits: data[hash].digits || 6,
         algorithm: rawAlgorithm
-          ? (parseInt(rawAlgorithm) as OTPAlgorithm)
+          ? OTPAlgorithm[rawAlgorithm]
           : OTPAlgorithm.SHA1,
         pinned: data[hash].pinned || false,
         hash: data[hash].hash || hash,