diff --git a/management/univention-management-console-module-diagnostic/umc/python/diagnostic/plugins/03_check_notifier_replication.py b/management/univention-management-console-module-diagnostic/umc/python/diagnostic/plugins/03_check_notifier_replication.py
index d0fdd364fb..2b0d9ff42f 100755
--- a/management/univention-management-console-module-diagnostic/umc/python/diagnostic/plugins/03_check_notifier_replication.py
+++ b/management/univention-management-console-module-diagnostic/umc/python/diagnostic/plugins/03_check_notifier_replication.py
@@ -34,7 +34,7 @@
 import socket
 
 import univention.config_registry
-from univention.management.console.modules.diagnostic import Warning
+from univention.management.console.modules.diagnostic import Warning, Critical
 
 from univention.lib.i18n import Translation
 _ = Translation('univention-management-console-module-diagnostic').translate
@@ -74,9 +74,16 @@ def run(_umc_instance):
 		with open('/var/lib/univention-directory-listener/notifier_id') as fob:
 			id_from_file = fob.read().strip()
 
+		if notifier_id < id_from_file:
+			ed = [
+				_('Univention Directory Notifier ID is lower than the locally stored ID.'),
+				_('This indicates a rollback of the Master, this system needs to be re-joined.')
+			]
+			raise Critical('\n'.join(ed))
+
 		if notifier_id != id_from_file:
 			ed = [
-				_('Univention Directory Notifier ID and the locally stored version differ.'),
+				_('Univention Directory Notifier ID and the locally stored ID differ.'),
 				_('This might indicate an error or still processing transactions.')
 			]
 			raise Warning('\n'.join(ed))