diff --git a/src/main/java/com/tonikelope/megabasterd/MiscTools.java b/src/main/java/com/tonikelope/megabasterd/MiscTools.java
index c465d3d4f..ae3d546f0 100644
--- a/src/main/java/com/tonikelope/megabasterd/MiscTools.java
+++ b/src/main/java/com/tonikelope/megabasterd/MiscTools.java
@@ -1155,7 +1155,9 @@ public final class MiscTools {
 
                 boolean error_2FA = false;
 
-                if (ma.check2FA(email)) {
+                HashMap<String, Object> old_session_data = DBTools.selectMegaSession(email);
+
+                if (old_session_data != null && ma.check2FA(email)) {
 
                     Get2FACode dialog = new Get2FACode((Frame) container.getParent(), true, email, main_panel);
 
@@ -1173,8 +1175,6 @@ public final class MiscTools {
                 if (!error_2FA) {
                     try {
 
-                        HashMap<String, Object> old_session_data = DBTools.selectMegaSession(email);
-
                         boolean unserialization_error = false;
 
                         if (old_session_data != null) {