diff --git a/frontend/pages/hosts/details/cards/Software/SelfService/SelfServiceTableConfig.tsx b/frontend/pages/hosts/details/cards/Software/SelfService/SelfServiceTableConfig.tsx
index ec0c7ee854..6fdcf17844 100644
--- a/frontend/pages/hosts/details/cards/Software/SelfService/SelfServiceTableConfig.tsx
+++ b/frontend/pages/hosts/details/cards/Software/SelfService/SelfServiceTableConfig.tsx
@@ -293,6 +293,7 @@ const InstallerStatusAction = ({
         onInstallOrUninstall();
       }
     } catch (error) {
+      // We only show toast message if API returns an error
       renderFlash("error", "Couldn't install. Please try again.");
     }
   }, [deviceToken, id, onInstallOrUninstall, renderFlash]);
diff --git a/frontend/pages/hosts/details/cards/Software/SelfService/UninstallSoftwareModal/UninstallSoftwareModal.tsx b/frontend/pages/hosts/details/cards/Software/SelfService/UninstallSoftwareModal/UninstallSoftwareModal.tsx
index e3398a8f88..956502d291 100644
--- a/frontend/pages/hosts/details/cards/Software/SelfService/UninstallSoftwareModal/UninstallSoftwareModal.tsx
+++ b/frontend/pages/hosts/details/cards/Software/SelfService/UninstallSoftwareModal/UninstallSoftwareModal.tsx
@@ -36,10 +36,9 @@ const UninstallSoftwareModal = ({
     setIsUninstalling(true);
     try {
       await deviceUserAPI.uninstallSelfServiceSoftware(token, softwareId);
-      // TODO: Change this toast message or hide it all together?
-      // renderFlash("success", "Software uninstalled successfully!");
       onSuccess();
     } catch (error) {
+      // We only show toast message to end user if API returns an error
       renderFlash("error", "Couldn't uninstall. Please try again.");
     }
     setIsUninstalling(false);