diff --git a/.cirrus.yml b/.cirrus.yml
index 7a50417e0e..2604595b92 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -161,6 +161,7 @@ sanitizer_task:
   << : *CI_TEMPLATE
   test_fuzzers_script: ./ci/test-fuzzers.sh
   env:
+    CXXFLAGS: -DZEEK_DICT_DEBUG
     ZEEK_CI_CONFIGURE_FLAGS: *SANITIZER_CONFIG
     ZEEK_TAILORED_UB_CHECKS: 1
     UBSAN_OPTIONS: print_stacktrace=1
diff --git a/CHANGES b/CHANGES
index a357890af0..6b777831a1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 
+3.3.0-dev.422 | 2020-10-13 16:26:24 -0700
+
+  * GH-1208: Use Dictionary validity assertions only during CI (Jon Siwek, Corelight)
+
 3.3.0-dev.420 | 2020-10-13 15:34:02 -0700
 
   * Change "Cluster::Node$p" field to use "&default=0/unknown" (Seth Hall, Corelight)
diff --git a/VERSION b/VERSION
index d768ba5fb5..a9fa5e6c55 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.3.0-dev.420
+3.3.0-dev.422
diff --git a/src/Dict.cc b/src/Dict.cc
index f4144fb464..06aa643ee0 100644
--- a/src/Dict.cc
+++ b/src/Dict.cc
@@ -17,7 +17,7 @@
 
 #include "3rdparty/doctest.h"
 
-#ifdef DEBUG
+#if defined(DEBUG) && defined(ZEEK_DICT_DEBUG)
 #define ASSERT_VALID(o)	o->AssertValid()
 #else
 #define ASSERT_VALID(o)