diff --git a/node/src/main/scala/org/bitcoins/node/PeerManager.scala b/node/src/main/scala/org/bitcoins/node/PeerManager.scala
index 0ff0d4d660..d52d2b88cd 100644
--- a/node/src/main/scala/org/bitcoins/node/PeerManager.scala
+++ b/node/src/main/scala/org/bitcoins/node/PeerManager.scala
@@ -553,6 +553,10 @@ case class PeerManager(
         }
       case (state, c: ConnectPeer) =>
         state match {
+          case s: NodeShuttingDown =>
+            logger.warn(
+              s"Ignoring connect peer request as node is shutting down, c=$c")
+            Future.successful(s)
           case runningState: NodeRunningState =>
             val peer = c.peer
             val curPeerData = finder.popFromCache(peer).get