diff --git a/src/motif/app.cpp b/src/motif/app.cpp
index 4fa8fbcc8f..eacfa20a29 100644
--- a/src/motif/app.cpp
+++ b/src/motif/app.cpp
@@ -132,8 +132,6 @@ void wxApp::CleanUp()
 #endif
         delete it->second;
     }
-
-    delete m_perDisplayData;
 }
 
 void wxApp::Exit()
@@ -161,7 +159,7 @@ wxApp::wxApp()
 
 wxApp::~wxApp()
 {
-    wxApp::SetInstance(NULL);
+    delete m_perDisplayData;
 }
 
 int wxApp::MainLoop()