1 files changed, 8 insertions, 0 deletions

diff --git a/src/xselect.c b/src/xselect.c
index cd49e05171b..e6103043dce 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -964,6 +964,12 @@ x_handle_selection_request (event)
       Atom type;
       int nofree;
 
+      if (CONSP (converted_selection) && NILP (XCDR (converted_selection)))
+        {
+          x_decline_selection_request (event);
+          goto DONE2;
+        }
+
       lisp_data_to_selection_data (SELECTION_EVENT_DISPLAY (event),
                                    converted_selection,
                                    &data, &type, &size, &format, &nofree);
@@ -979,6 +985,8 @@ x_handle_selection_request (event)
       if (!nofree)
         xfree (data);
     }
+
+ DONE2:
   unbind_to (count, Qnil);
 
  DONE: