diff --git a/ChangeLog b/ChangeLog
index bbe8480..cb97b24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,11 @@ ChangeLog
 ============
 
 - 0.36.0
-  - added support for using custom connection class(#235)
-  - use Named logger(#238)
-  - implement ping/pong timeout(#241)
-  - Corrects the syntax highlight code(#243)
+  - added support for using custom connection class (#235)
+  - use Named logger (#238)
+  - implement ping/pong timeout (#241)
+  - Corrects the syntax highlight code (#243)
+  - fixed failure to join thread before it is started (#242)
 
 - 0.35.0
   - Prints timings in console (#217)
diff --git a/websocket/_app.py b/websocket/_app.py
index cb5d393..af67080 100644
--- a/websocket/_app.py
+++ b/websocket/_app.py
@@ -222,7 +222,7 @@ class WebSocketApp(object):
                 # propagate SystemExit further
                 raise
         finally:
-            if thread:
+            if thread and thread.isAlive():
                 event.set()
                 thread.join()
                 self.keep_running = False