diff --git a/libs/pbd/pbd/ui_callback.h b/libs/pbd/pbd/ui_callback.h
index d5f4c51f4e..55691eb843 100644
--- a/libs/pbd/pbd/ui_callback.h
+++ b/libs/pbd/pbd/ui_callback.h
@@ -34,8 +34,8 @@ class UICallback
 
 	virtual void call_slot (sigc::slot<void> theSlot) = 0;
 
-	static UICallback* get_ui_for_thread() { return thread_ui.get(); }
-	static void set_ui_for_thread (UICallback* ui) { return thread_ui.set (ui); }
+	static UICallback* get_ui_for_thread();
+	static void set_ui_for_thread (UICallback* ui);
 
   private:
 	static Glib::StaticPrivate<UICallback> thread_ui;
diff --git a/libs/pbd/ui_callback.cc b/libs/pbd/ui_callback.cc
index 954d25f637..9a8feb3d2c 100644
--- a/libs/pbd/ui_callback.cc
+++ b/libs/pbd/ui_callback.cc
@@ -4,3 +4,16 @@ using namespace PBD;
 
 Glib::StaticPrivate<UICallback> UICallback::thread_ui;
 
+static void do_not_delete_the_ui_pointer (void*) { }
+
+UICallback* 
+UICallback::get_ui_for_thread() {
+	return thread_ui.get ();
+}
+
+void 
+UICallback::set_ui_for_thread (UICallback* ui) 
+{
+	thread_ui.set (ui, do_not_delete_the_ui_pointer); 
+}
+