diff --git a/radio/src/thirdparty/libopenui/src/window.cpp b/radio/src/thirdparty/libopenui/src/window.cpp
index 8297b339b..1f0dd159b 100644
--- a/radio/src/thirdparty/libopenui/src/window.cpp
+++ b/radio/src/thirdparty/libopenui/src/window.cpp
@@ -195,6 +195,7 @@ Window::~Window()
   if (children.size() > 0) deleteChildren();
 
   if (lvobj != nullptr) {
+    lv_obj_set_user_data(lvobj, nullptr);
     lv_obj_del(lvobj);
     lvobj = nullptr;
   }
@@ -269,8 +270,8 @@ void Window::clearLvgl()
     if(window->lvobj != nullptr && window->lvobj->parent == lvobj)
       window->clearLvgl();
   }
-//  lv_obj_set_user_data(lvobj, nullptr);
 
+  lv_obj_set_user_data(lvobj, nullptr);
   lvobj = nullptr;
 }