diff --git a/src/cpp/ripple/JobQueue.cpp b/src/cpp/ripple/JobQueue.cpp
index 53d98484b4..6ecc86791a 100644
--- a/src/cpp/ripple/JobQueue.cpp
+++ b/src/cpp/ripple/JobQueue.cpp
@@ -101,7 +101,9 @@ void JobQueue::addJob(JobType type, const boost::function<void(Job&)>& jobFunc)
 	assert(type != jtINVALID);
 
 	boost::mutex::scoped_lock sl(mJobLock);
-	assert(mThreadCount != 0); // do not add jobs to a queue with no threads
+
+	if (type != jtCLIENT) // FIXME: Workaround incorrect client shutdown ordering
+		assert(mThreadCount != 0); // do not add jobs to a queue with no threads
 
 	mJobSet.insert(Job(type, ++mLastJob, mJobLoads[type], jobFunc));
 	++mJobCounts[type];