diff --git a/src/box/tuple_update.c b/src/box/tuple_update.c
index 01c55fb1a700b32a2738eb407928b64282305744..84907325880ca3eb6375722b2da59b65c652618a 100644
--- a/src/box/tuple_update.c
+++ b/src/box/tuple_update.c
@@ -834,6 +834,8 @@ update_create_rope(struct tuple_update *update, const char *tuple_data,
 		return -1;
 	const char *field = tuple_data;
 	const char *end = tuple_data_end;
+	if (field == end)
+		return 0;
 
 	/* Add first field to rope */
 	mp_next(&tuple_data);
diff --git a/test/box/tuple.result b/test/box/tuple.result
index 82ad8404d2122e6f6e9c340f0482dcc16befafa1..2561ebc35ca96d92a4439503038212e04a1667e3 100644
--- a/test/box/tuple.result
+++ b/test/box/tuple.result
@@ -859,6 +859,27 @@ t
 t = nil
 ---
 ...
+--
+-- gh-4041: Invalid field on empty tuple update.
+--
+t = box.tuple.new{}
+---
+...
+t:update({{'=', 1, 1}})
+---
+- [1]
+...
+t:upsert({{'=', 1, 1}})
+---
+- [1]
+...
+t:update({{'+', 1, 1}})
+---
+- error: Field 1 was not found in the tuple
+...
+t = nil
+---
+...
 --------------------------------------------------------------------------------
 -- test msgpack.encode + tuple
 --------------------------------------------------------------------------------
diff --git a/test/box/tuple.test.lua b/test/box/tuple.test.lua
index 8030b088430231584e910fef0861c77fd22deef0..b0a4ab173c4fe59caf7fc75d84f4a4b15bc62534 100644
--- a/test/box/tuple.test.lua
+++ b/test/box/tuple.test.lua
@@ -270,6 +270,16 @@ t = box.tuple.new(require('yaml').decode("[17711728, {1000: 'xxx'}]"))
 t:update({{'=', 2, t[2]}})
 t
 t = nil
+
+--
+-- gh-4041: Invalid field on empty tuple update.
+--
+t = box.tuple.new{}
+t:update({{'=', 1, 1}})
+t:upsert({{'=', 1, 1}})
+t:update({{'+', 1, 1}})
+t = nil
+
 --------------------------------------------------------------------------------
 -- test msgpack.encode + tuple
 --------------------------------------------------------------------------------