1 files changed, 1 insertions, 1 deletions

diff --git a/src/composite.h b/src/composite.h
index e30deabb7f6..ce47aee7098 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -76,7 +76,7 @@ extern Lisp_Object composition_temp;
 #define COMPOSITION_MODIFICATION_FUNC(prop)     \
   (COMPOSITION_REGISTERD_P (prop)               \
    ? XCDR (XCDR (XCDR (prop)))                  \
-   : XCDR (prop))
+   : CONSP (prop) ? XCDR (prop) : Qnil)
 
 /* Return the method of composition.  */
 #define COMPOSITION_METHOD(prop)                                        \