diff --git a/libs/surfaces/websockets/feedback.cc b/libs/surfaces/websockets/feedback.cc
index d083a6ff2e..6fa8205bd5 100644
--- a/libs/surfaces/websockets/feedback.cc
+++ b/libs/surfaces/websockets/feedback.cc
@@ -102,21 +102,10 @@ struct PluginParamValueObserver {
 FeedbackHelperUI::FeedbackHelperUI()
 	: AbstractUI<BaseUI::BaseRequestObject> ("WS_FeedbackHelperUI")
 {
-	// This renames and changes the event loop for the main thread, presumably
-	// this is not the actually desired behavior.
-	char name[64];
-	snprintf (name, 64, "WS-%p", (void*)DEBUG_THREAD_SELF);
- 	pthread_set_name (name);
-	/* The event loop needs to be restored when FeedbackHelperUI is destroyed,
-	 * otherwise future access will result in a crash (heap-use-after-free).
-	 */
-	_main_event_loop = get_event_loop_for_thread ();
-	set_event_loop_for_thread (this);
 }
 
 FeedbackHelperUI::~FeedbackHelperUI ()
 {
-	set_event_loop_for_thread (_main_event_loop);
 }
 
 void