diff --git a/src/mailtm/email.py b/src/mailtm/email.py
index 94bf592..3b908c1 100644
--- a/src/mailtm/email.py
+++ b/src/mailtm/email.py
@@ -11,12 +11,11 @@ def password_gen(length=8, chars= string.ascii_letters + string.digits + string.
     return ''.join(random.choice(chars) for _ in range(length))  
 
 class Email(Listen):
-    token = ""
-    domain = ""
-    address = ""
-    session = requests.Session()
-
     def __init__(self):
+        self.token = ""
+        self.domain = ""
+        self.address = ""
+        self.session = requests.Session()
         if not self.domains():
             print("Failed to get domains")
 
@@ -74,7 +73,12 @@ def get_token(self, password):
             self.token = response.json()['token']
         except:
             raise Exception("Failed to get token")
-        
+
+    def stop(self):
+        self.listen = False
+        self.session.close()
+        self.thread.join()
+
 
 if __name__ == "__main__":
     def listener(message):
@@ -93,5 +97,5 @@ def listener(message):
     test.start(listener)
     print("\nWaiting for new emails...")
 
-    # Stop listening
-    # test.stop()
+    # Stop listening and close session
+    test.stop()