1 files changed, 3 insertions, 2 deletions

diff --git a/src/syntax.h b/src/syntax.h
index 35d50899e3f..4b58b5da636 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -284,8 +284,9 @@ if (1)									\
     gl_state.offset = 0;                                                \
     gl_state.current_syntax_table = current_buffer->syntax_table;       \
     if (parse_sexp_lookup_properties)                                   \
-      update_syntax_table ((COUNT) > 0 ? (FROM) : (FROM) - 1, (COUNT),  \
-                           1, Qnil);                                    \
+      if ((COUNT) > 0 || (FROM) > BEGV)                                 \
+        update_syntax_table ((COUNT) > 0 ? (FROM) : (FROM) - 1, (COUNT),\
+                             1, Qnil);                                  \
   }                                                                     \
 else