diff --git a/src/server/sharedstate_pv.cpp b/src/server/sharedstate_pv.cpp
index 8c66327..3e9b184 100644
--- a/src/server/sharedstate_pv.cpp
+++ b/src/server/sharedstate_pv.cpp
@@ -80,6 +80,7 @@ SharedPV::SharedPV(const std::tr1::shared_ptr<Handler> &handler, pvas::SharedPV:
 }
 
 SharedPV::~SharedPV() {
+    close();
     REFTRACE_DECREMENT(num_instances);
 }