diff --git a/ajax_comments.module b/ajax_comments.module
index f1abb2b..a556107 100644
--- a/ajax_comments.module
+++ b/ajax_comments.module
@@ -568,7 +568,13 @@ function ajax_comments_remove_status() {
   $not_published = t('Your comment has been queued for review by site administrators and will be published after approval.');
   foreach ($_SESSION['messages']['status'] as $key => $value) {
     if ($value == $published || $value == $not_published || $value = $deleted) {
-      unset($_SESSION['messages']['status']);
+      unset($_SESSION['messages']['status'][$key]);
+    }
+  }
+  if (empty($_SESSION['messages']['status'])) {
+    unset($_SESSION['messages']['status']);
+    if (empty($_SESSION['messages'])) {
+      unset($_SESSION['messages']);
     }
   }
 }