diff --git a/src/libtomahawk/audio/audioengine.cpp b/src/libtomahawk/audio/audioengine.cpp
index a64c8abac..27d4bf5f7 100644
--- a/src/libtomahawk/audio/audioengine.cpp
+++ b/src/libtomahawk/audio/audioengine.cpp
@@ -64,7 +64,8 @@ AudioEngine::~AudioEngine()
 {
     qDebug() << Q_FUNC_INFO;
 
-    stop();
+    m_mediaObject->stop();
+//    stop();
 
     delete m_audioOutput;
     delete m_mediaObject;
diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp
index 158126a6b..4ba7ad016 100644
--- a/src/tomahawkapp.cpp
+++ b/src/tomahawkapp.cpp
@@ -330,26 +330,21 @@ TomahawkApp::~TomahawkApp()
     
 #ifndef TOMAHAWK_HEADLESS
     delete m_mainwindow;
+    delete m_audioEngine;
 #endif
 
     delete m_infoSystem;
 
     //FIXME: delete GeneratorFactory::registerFactory( "echonest", new EchonestFactory ); ?
 
-    delete m_database;
-
-    delete SipHandler::instance();
-    
+    delete SipHandler::instance();    
     delete m_servent;
-    
-    Pipeline::instance()->stop();
-    delete Pipeline::instance();    
 
     delete m_scanManager;
+    delete m_database;
     
-#ifndef TOMAHAWK_HEADLESS
-    delete m_audioEngine;
-#endif
+    Pipeline::instance()->stop();
+    delete Pipeline::instance();
 
     delete TomahawkUtils::proxyFactory();
     delete TomahawkUtils::nam();