diff --git a/api/tacticalrmm/agents/models.py b/api/tacticalrmm/agents/models.py
index 3933c3fe47..ee2973cbed 100644
--- a/api/tacticalrmm/agents/models.py
+++ b/api/tacticalrmm/agents/models.py
@@ -135,7 +135,12 @@ def save(self, *args, **kwargs):
             orig = Agent.objects.get(pk=self.pk)
             mon_type_changed = self.monitoring_type != orig.monitoring_type
             site_changed = self.site_id != orig.site_id
-            if mon_type_changed or site_changed:
+            policy_changed = self.policy != orig.policy
+            block_inherit = (
+                self.block_policy_inheritance != orig.block_policy_inheritance
+            )
+
+            if mon_type_changed or site_changed or policy_changed or block_inherit:
                 self._processing_set_alert_template = True
                 self.set_alert_template()
                 self._processing_set_alert_template = False
diff --git a/api/tacticalrmm/alerts/models.py b/api/tacticalrmm/alerts/models.py
index 8067096a80..c28b6d7599 100644
--- a/api/tacticalrmm/alerts/models.py
+++ b/api/tacticalrmm/alerts/models.py
@@ -589,6 +589,8 @@ def handle_alert_resolve(
         core = CoreSettings.objects.first()
 
         # set variables
+        email_severities = None
+        text_severities = None
         email_on_resolved = False
         text_on_resolved = False
         resolved_email_task = None
@@ -691,7 +693,7 @@ def handle_alert_resolve(
                 and not core.notify_on_warning_alerts
             ):
                 pass
-            elif alert.severity not in email_severities:
+            elif email_severities and alert.severity not in email_severities:
                 pass
             else:
                 resolved_email_task.delay(pk=alert.pk)
@@ -706,7 +708,7 @@ def handle_alert_resolve(
                 and not core.notify_on_warning_alerts
             ):
                 pass
-            elif alert.severity not in text_severities:
+            elif text_severities and alert.severity not in text_severities:
                 pass
             else:
                 resolved_text_task.delay(pk=alert.pk)
diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py
index c9f67c581c..f0a7cd890d 100644
--- a/api/tacticalrmm/tacticalrmm/settings.py
+++ b/api/tacticalrmm/tacticalrmm/settings.py
@@ -21,7 +21,7 @@
 AUTH_USER_MODEL = "accounts.User"
 
 # latest release
-TRMM_VERSION = "0.19.0"
+TRMM_VERSION = "0.19.1"
 
 # https://github.com/amidaware/tacticalrmm-web
 WEB_VERSION = "0.101.47"