diff --git a/libopenage/engine/engine.h b/libopenage/engine/engine.h
index da56e4ead0..967174fe27 100644
--- a/libopenage/engine/engine.h
+++ b/libopenage/engine/engine.h
@@ -21,7 +21,9 @@ class jthread : public thread {
 	jthread(jthread &&) = default;
 	jthread &operator=(jthread &&) = default;
 	~jthread() {
-		this->join();
+		if (this->joinable()) {
+			this->join();
+		}
 	}
 };
 } // namespace std