diff --git a/proxy/registry/config_cache.go b/proxy/registry/config_cache.go
index 47868820c..fea5c992a 100644
--- a/proxy/registry/config_cache.go
+++ b/proxy/registry/config_cache.go
@@ -26,6 +26,9 @@ func MarshalInboundConfig(protocol string, settings *any.Any) (interface{}, erro
 	if err != nil {
 		return nil, err
 	}
+	if settings == nil {
+		return config, nil
+	}
 	if err := ptypes.UnmarshalAny(settings, config.(proto.Message)); err != nil {
 		return nil, err
 	}
@@ -37,6 +40,9 @@ func MarshalOutboundConfig(protocol string, settings *any.Any) (interface{}, err
 	if err != nil {
 		return nil, err
 	}
+	if settings == nil {
+		return config, nil
+	}
 	if err := ptypes.UnmarshalAny(settings, config.(proto.Message)); err != nil {
 		return nil, err
 	}