diff --git a/clutter/clutter-input-device.c b/clutter/clutter-input-device.c
index 4a29742be..d77677dcb 100644
--- a/clutter/clutter-input-device.c
+++ b/clutter/clutter-input-device.c
@@ -79,7 +79,7 @@ clutter_input_device_dispose (GObject *gobject)
 {
   ClutterInputDevice *device = CLUTTER_INPUT_DEVICE (gobject);
 
-  g_free (device->device_name);
+  g_clear_pointer (&device->device_name, g_free);
 
   if (device->associated != NULL)
     {