diff --git a/servers/puppet/modules/zulip/files/nagios_plugins/check_pg_replication_lag b/servers/puppet/modules/zulip/files/nagios_plugins/check_pg_replication_lag
index 317ecf7327..8bc1cb8f6a 100755
--- a/servers/puppet/modules/zulip/files/nagios_plugins/check_pg_replication_lag
+++ b/servers/puppet/modules/zulip/files/nagios_plugins/check_pg_replication_lag
@@ -56,15 +56,9 @@ recv_diff = primary_offset - secondary_recv_offset
 replay_diff = secondary_recv_offset - secondary_replay_offset
 
 # xlog segments are normally 16MB each.  These thresholds are pretty arbitrary.
-if recv_diff > 16 * 1024**2:
-    report('WARNING', 'secondary is %d bytes behind on receiving xlog' % (recv_diff,))
-
 if recv_diff > 5 * 16 * 1024**2:
     report('CRITICAL', 'secondary is %d bytes behind on receiving xlog' % (recv_diff,))
 
-if replay_diff > 16 * 1024**2:
-    report('WARNING', 'secondary is %d bytes behind on applying received xlog' % (replay_diff))
-
 if replay_diff > 5 * 16 * 1024**2:
     report('CRITICAL', 'secondary is %d bytes behind on applying received xlog' % (replay_diff))
 
@@ -74,5 +68,11 @@ if recv_diff < 0:
 if replay_diff < 0:
     report('CRITICAL', 'secondary is %d bytes ahead on applying received xlog' % (replay_diff,))
 
+if recv_diff > 16 * 1024**2:
+    report('WARNING', 'secondary is %d bytes behind on receiving xlog' % (recv_diff,))
+
+if replay_diff > 16 * 1024**2:
+    report('WARNING', 'secondary is %d bytes behind on applying received xlog' % (replay_diff))
+
 report('OK', ('secondary is %d bytes behind on receiving and %d bytes behind on applying xlog'
               % (recv_diff, replay_diff)))