diff --git a/var/spack/repos/builtin/packages/babeltrace2/d2d2e6cc.patch b/var/spack/repos/builtin/packages/babeltrace2/d2d2e6cc.patch
new file mode 100644
index 00000000000000..396f5dfe827604
--- /dev/null
+++ b/var/spack/repos/builtin/packages/babeltrace2/d2d2e6cc.patch
@@ -0,0 +1,14 @@
+--- a/src/plugins/ctf/common/msg-iter/msg-iter.c	2021-02-10 00:13:50.634356354 +0000
++++ b/src/plugins/ctf/common/msg-iter/msg-iter.c	2021-02-10 00:14:14.990009271 +0000
+@@ -2049,11 +2049,6 @@
+ 		goto end;
+ 	}
+ 
+-	if (value == 0) {
+-		msg_it->done_filling_string = true;
+-		goto end;
+-	}
+-
+ 	string_field = stack_top(msg_it->stack)->base;
+ 	BT_ASSERT_DBG(bt_field_get_class_type(string_field) ==
+ 		BT_FIELD_CLASS_TYPE_STRING);
diff --git a/var/spack/repos/builtin/packages/babeltrace2/package.py b/var/spack/repos/builtin/packages/babeltrace2/package.py
index b0cd0c681c481f..14e9969b11e6c0 100644
--- a/var/spack/repos/builtin/packages/babeltrace2/package.py
+++ b/var/spack/repos/builtin/packages/babeltrace2/package.py
@@ -23,6 +23,8 @@ class Babeltrace2(AutotoolsPackage):
     depends_on('python', when='+python')
     depends_on('swig', when='+python')
 
+    patch('d2d2e6cc.patch')
+
     def configure_args(self):
         args = []
         if '+python' in self.spec: