diff --git a/src/cpp/ripple/Application.cpp b/src/cpp/ripple/Application.cpp
index 332a2e4d88..1da62bd3d9 100644
--- a/src/cpp/ripple/Application.cpp
+++ b/src/cpp/ripple/Application.cpp
@@ -518,6 +518,12 @@ bool serverOkay(std::string& reason)
 		return false;
 	}
 
+	if (theApp->isShutdown())
+	{
+		reason = "Server is shutting down";
+		return false;
+	}
+
 	if (theApp->getOPs().isNeedNetworkLedger())
 	{
 		reason = "Not synchronized with network yet";