diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index 4c649736f..79ca6bc37 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -307,9 +307,6 @@ TomahawkApp::~TomahawkApp()
     if ( !m_audioEngine.isNull() )
         delete m_audioEngine.data();
 
-    if ( !m_infoSystem.isNull() )
-        delete m_infoSystem.data();
-
     delete SipHandler::instance();
 
 #ifndef ENABLE_HEADLESS
@@ -324,6 +321,9 @@ TomahawkApp::~TomahawkApp()
     if ( !m_database.isNull() )
         delete m_database.data();
 
+    if ( !m_infoSystem.isNull() )
+        delete m_infoSystem.data();
+
     tLog() << "Finished shutdown.";
 }