diff --git a/src/app/services/importService.js b/src/app/services/importService.js
index 902c59f8e7..fcef9dd834 100644
--- a/src/app/services/importService.js
+++ b/src/app/services/importService.js
@@ -232,7 +232,7 @@
                         }
 
                         logins.push({
-                            favorite: value.favorite !== null ? value.favorite : false,
+                            favorite: value.favorite && value.favorite !== '' && && value.favorite !== '0',
                             uri: value.uri && value.uri !== '' ? trimUri(value.uri) : null,
                             username: value.username && value.username !== '' ? value.username : null,
                             password: value.password && value.password !== '' ? value.password : null,
diff --git a/src/app/tools/toolsExportController.js b/src/app/tools/toolsExportController.js
index ac5fd56e3e..4a2e3cfad7 100644
--- a/src/app/tools/toolsExportController.js
+++ b/src/app/tools/toolsExportController.js
@@ -17,7 +17,8 @@
                             username: decLogins[i].username,
                             password: decLogins[i].password,
                             notes: decLogins[i].notes,
-                            folder: decLogins[i].folder ? decLogins[i].folder.name : null
+                            folder: decLogins[i].folder ? decLogins[i].folder.name : null,
+                            favorite: decLogins[i].favorite ? 1 : null
                         };
 
                         exportLogins.push(login);