diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index 6d4b49be0b..b0a6479c62 100644
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -406,7 +406,7 @@ Delivery::set_state (const XMLNode& node, int version)
 
 	XMLNode* pannnode = node.child (X_("Pannable"));
 
-	if (_panshell && _panshell->panner() && pannnode) {
+	if (_panshell && _panshell->unlinked_pannable() && pannnode) {
 		_panshell->unlinked_pannable()->set_state (*pannnode, version);
 	}