diff --git a/framework/core/src/Core/Listener/DiscussionMetadataUpdater.php b/framework/core/src/Core/Listener/DiscussionMetadataUpdater.php
index cf1ebb3fc..ee35c24e2 100755
--- a/framework/core/src/Core/Listener/DiscussionMetadataUpdater.php
+++ b/framework/core/src/Core/Listener/DiscussionMetadataUpdater.php
@@ -54,7 +54,7 @@ class DiscussionMetadataUpdater
 
         $discussion = $event->post->discussion;
 
-        if ($discussion->posts()->count() === 0) {
+        if ($discussion && $discussion->posts()->count() === 0) {
             $discussion->delete();
         }
     }