diff --git a/pages/unsubscribe/[watchlistid].js b/pages/unsubscribe/[watchlistid].js
index 024e8b9d..490331de 100644
--- a/pages/unsubscribe/[watchlistid].js
+++ b/pages/unsubscribe/[watchlistid].js
@@ -103,7 +103,7 @@ const deleteWatchedCases = async (watchedCaseID) => {
 
     return axios(config)
         .then(({ data }) => {
-            //console.log("deleted watched case - " + watchedCaseID);
+            console.log("deleted watched case - " + watchedCaseID);
             res.status(200).json(data);
         })
         .catch((error) => {
diff --git a/pages/unsubscribeall/[watchlistid].js b/pages/unsubscribeall/[watchlistid].js
index 47222f65..e5b7f505 100644
--- a/pages/unsubscribeall/[watchlistid].js
+++ b/pages/unsubscribeall/[watchlistid].js
@@ -40,22 +40,29 @@ const UnsubscribeCase = (props) => {
                                 <h1>{t("common:unsubscribe-case-title")}</h1>
 
                                 <p>
-                                    {t("common:unsubscribe-case-all-label")}
-                                    {casesArr.length > 0 ? "s" : ""}
+                                    {casesArr == null
+                                        ? t(
+                                              "common:unsubscribe-case-none-label"
+                                          )
+                                        : t(
+                                              "common:unsubscribe-case-all-label"
+                                          ) + (casesArr.length > 0 ? "s" : "")}
                                 </p>
-                                <ul>
-                                    {casesArr.map((key, index) => (
-                                        <li key={index}>
-                                            <strong>
-                                                {
-                                                    key[
-                                                        "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
-                                                    ]
-                                                }
-                                            </strong>
-                                        </li>
-                                    ))}
-                                </ul>
+                                {casesArr != null && (
+                                    <ul>
+                                        {casesArr.map((key, index) => (
+                                            <li key={index}>
+                                                <strong>
+                                                    {
+                                                        key[
+                                                            "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
+                                                        ]
+                                                    }
+                                                </strong>
+                                            </li>
+                                        ))}
+                                    </ul>
+                                )}
 
                                 <Link href="/">
                                     {t("common:logged-out-link")}
@@ -154,8 +161,10 @@ export const getServerSideProps = wrapper.getServerSideProps(
 
         //hasUnsubscribed && (await deleteWatchedCases(query.watchlistid));
 
-        searchResultsObj.value.forEach(function (watchListID) {
+        searchResultsObj.value.forEach(async function (watchListID) {
             console.log(watchListID.pinswg_watchlistid);
+
+            deleteWatchedCases(watchListID.pinswg_watchlistid);
         });
 
         //console.log(deleteCase);