diff --git a/peer/cwtch_peer.go b/peer/cwtch_peer.go
index e7c11e5..9a8ad47 100644
--- a/peer/cwtch_peer.go
+++ b/peer/cwtch_peer.go
@@ -444,7 +444,9 @@ func (cp *cwtchPeer) Listen() error {
 // Shutdown kills all connections and cleans up all goroutines for the peer
 func (cp *cwtchPeer) Shutdown() {
 	cp.connectionsManager.Shutdown()
-	cp.app.Shutdown()
+	if cp.app != nil {
+		cp.app.Shutdown()
+	}
 	cp.Save()
 }