diff --git a/app/render/previewautocacher.cpp b/app/render/previewautocacher.cpp
index 2f706537f..675b6a5b1 100644
--- a/app/render/previewautocacher.cpp
+++ b/app/render/previewautocacher.cpp
@@ -28,6 +28,12 @@ PreviewAutoCacher::PreviewAutoCacher() :
   connect(&delayed_requeue_timer_, &QTimer::timeout, this, &PreviewAutoCacher::RequeueFrames);
 }
 
+PreviewAutoCacher::~PreviewAutoCacher()
+{
+  // Ensure everything is cleaned up appropriately
+  SetViewerNode(nullptr);
+}
+
 RenderTicketPtr PreviewAutoCacher::GetSingleFrame(const rational &t)
 {
   if (single_frame_render_) {
diff --git a/app/render/previewautocacher.h b/app/render/previewautocacher.h
index b7cd698af..3c3542eea 100644
--- a/app/render/previewautocacher.h
+++ b/app/render/previewautocacher.h
@@ -24,6 +24,8 @@ class PreviewAutoCacher : public QObject
 public:
   PreviewAutoCacher();
 
+  virtual ~PreviewAutoCacher() override;
+
   RenderTicketPtr GetSingleFrame(const rational& t);
 
   /**