diff --git a/services/surfaceflinger/TransactionCompletedThread.cpp b/services/surfaceflinger/TransactionCompletedThread.cpp
index 2c81f0a..9b9dc57 100644
--- a/services/surfaceflinger/TransactionCompletedThread.cpp
+++ b/services/surfaceflinger/TransactionCompletedThread.cpp
@@ -36,7 +36,9 @@
         mConditionVariable.notify_all();
     }
 
-    mThread.join();
+    if (mThread.joinable()) {
+        mThread.join();
+    }
 
     {
         std::lock_guard lock(mMutex);