diff --git a/roles/nagios_client/files/scripts/check_fedmsg_consumer_backlog.py b/roles/nagios_client/files/scripts/check_fedmsg_consumer_backlog.py
index b024bd25a1..833d218e3b 100644
--- a/roles/nagios_client/files/scripts/check_fedmsg_consumer_backlog.py
+++ b/roles/nagios_client/files/scripts/check_fedmsg_consumer_backlog.py
@@ -11,7 +11,9 @@ try:
     check_consumer = sys.argv[2]
     backlog_warning = int(sys.argv[3])
     backlog_critical = int(sys.argv[4])
-    if os.path.exists('/var/run/fedmsg/monitoring-%s-.socket' % service):
+    if os.path.exists('/var/run/fedmsg/monitoring-%s.socket' % service):
+        fname = '/var/run/fedmsg/monitoring-%s.socket' % service
+    elif os.path.exists('/var/run/fedmsg/monitoring-%s-.socket' % service):
         fname = '/var/run/fedmsg/monitoring-%s-.socket' % service
     elif os.path.exists('/var/run/fedmsg/monitoring-%s-3.socket' % service):
         fname = '/var/run/fedmsg/monitoring-%s-3.socket' % service
diff --git a/roles/nagios_client/files/scripts/check_fedmsg_consumer_exceptions.py b/roles/nagios_client/files/scripts/check_fedmsg_consumer_exceptions.py
index 335f858c57..7219b0267e 100644
--- a/roles/nagios_client/files/scripts/check_fedmsg_consumer_exceptions.py
+++ b/roles/nagios_client/files/scripts/check_fedmsg_consumer_exceptions.py
@@ -11,7 +11,9 @@ try:
     check_consumer = sys.argv[2]
     exceptions_warning = int(sys.argv[3])
     exceptions_critical = int(sys.argv[4])
-    if os.path.exists('/var/run/fedmsg/monitoring-%s-.socket' % service):
+    if os.path.exists('/var/run/fedmsg/monitoring-%s.socket' % service):
+        fname = '/var/run/fedmsg/monitoring-%s.socket' % service
+    elif os.path.exists('/var/run/fedmsg/monitoring-%s-.socket' % service):
         fname = '/var/run/fedmsg/monitoring-%s-.socket' % service
     elif os.path.exists('/var/run/fedmsg/monitoring-%s-3.socket' % service):
         fname = '/var/run/fedmsg/monitoring-%s-3.socket' % service