diff --git a/app/gui/gui-vtable.c b/app/gui/gui-vtable.c
index e922221942..70375743f2 100644
--- a/app/gui/gui-vtable.c
+++ b/app/gui/gui-vtable.c
@@ -471,9 +471,9 @@ gui_wait_input_async (GimpAsync  *async,
 }
 
 static gboolean
-gui_wait (Gimp           *gimp,
-          GimpWaitable   *waitable,
-          const gchar    *message)
+gui_wait (Gimp         *gimp,
+          GimpWaitable *waitable,
+          const gchar  *message)
 {
   GimpProcedure  *procedure;
   GimpValueArray *args;
@@ -559,7 +559,12 @@ gui_wait (Gimp           *gimp,
   /* signal completion to the plug-in */
   close (output_pipe[1]);
 
-  g_clear_pointer (&input_async, gimp_waitable_wait);
+  if (input_async)
+    {
+      gimp_waitable_wait (GIMP_WAITABLE (input_async));
+
+      g_object_unref (input_async);
+    }
 
   close (input_pipe[0]);