diff --git a/src/WAClient/Tests.ts b/src/WAClient/Tests.ts
index eb2e81c..907ff61 100644
--- a/src/WAClient/Tests.ts
+++ b/src/WAClient/Tests.ts
@@ -5,7 +5,6 @@ import * as assert from 'assert'
 
 import { decodeMediaMessage, validateJIDForSending } from './Utils'
 import { promiseTimeout, createTimeout } from '../WAConnection/Utils'
-import { WAMessageContent, WAMessage } from '../WAConnection/Constants'
 
 require ('dotenv').config () // dotenv to load test jid
 const testJid = process.env.TEST_JID || '1234@s.whatsapp.net' // set TEST_JID=xyz@s.whatsapp.net in a .env file in the root directory
diff --git a/src/WAConnection/Base.ts b/src/WAConnection/Base.ts
index a3b83c9..43f0dee 100644
--- a/src/WAConnection/Base.ts
+++ b/src/WAConnection/Base.ts
@@ -278,6 +278,7 @@ export default class WAConnectionBase {
     close() {
         this.msgCount = 0
         if (this.conn) {
+            this.conn.removeAllListeners ('close')
             this.conn.close()
             this.conn = null
         }