diff --git a/CHANGES b/CHANGES
index 960fbbabb2..92dc6a6cd5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+5.1.0-dev.341 | 2022-08-05 16:21:13 +0000
+
+  * Added test case with back-to-back notices (Annie Bryan)
+
+  * Fix notice suppression atomicity bug (Annie Bryan)
+
 5.1.0-dev.337 | 2022-08-05 16:19:59 +0000
 
   * GH-2034: Store module names and use them in lookups for ifdef (Tim Wojtulewicz, Corelight)
diff --git a/VERSION b/VERSION
index a679c4dee3..d9bbb80e5a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5.1.0-dev.337
+5.1.0-dev.341
diff --git a/scripts/base/frameworks/notice/main.zeek b/scripts/base/frameworks/notice/main.zeek
index b5d3ec4a32..d34a22923a 100644
--- a/scripts/base/frameworks/notice/main.zeek
+++ b/scripts/base/frameworks/notice/main.zeek
@@ -538,6 +538,7 @@ hook Notice::notice(n: Notice::Info) &priority=-5
 	     n$suppress_for != 0secs )
 		{
 		event Notice::begin_suppression(n$ts, n$suppress_for, n$note, n$identifier);
+		suppressing[n$note, n$identifier] = n$ts + n$suppress_for;
 @if ( Cluster::is_enabled() && Cluster::local_node_type() != Cluster::MANAGER )
 		event Notice::manager_begin_suppression(n$ts, n$suppress_for, n$note, n$identifier);
 @endif
diff --git a/testing/btest/scripts/base/frameworks/notice/suppression.zeek b/testing/btest/scripts/base/frameworks/notice/suppression.zeek
index f284bb4600..5356cb0bd3 100644
--- a/testing/btest/scripts/base/frameworks/notice/suppression.zeek
+++ b/testing/btest/scripts/base/frameworks/notice/suppression.zeek
@@ -10,7 +10,7 @@ redef enum Notice::Type += {
 # The second notice needs to be scheduled due to how the notice framework
 # uses the event queue.
 
-event second_notice()
+event third_notice()
 	{
 	NOTICE([$note=Test_Notice, $msg="another test", $identifier="static"]);
 	}
@@ -18,6 +18,7 @@ event second_notice()
 event zeek_init()
 	{
 	NOTICE([$note=Test_Notice, $msg="test", $identifier="static"]);
-	schedule 1msec { second_notice() };
+	NOTICE([$note=Test_Notice, $msg="test again", $identifier="static"]);
+	schedule 1msec { third_notice() };
 	}