diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp
index 671c842be..630319ceb 100644
--- a/src/tomahawk/TomahawkWindow.cpp
+++ b/src/tomahawk/TomahawkWindow.cpp
@@ -118,7 +118,6 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
     , ui( new Ui::TomahawkWindow )
     , m_searchWidget( 0 )
     , m_trayIcon( 0 )
-    , m_audioRetryCounter( 0 )
 {
 #ifndef Q_OS_MAC
     setWindowIcon( QIcon( RESPATH "icons/tomahawk-icon-128x128.png" ) );
@@ -1257,23 +1256,20 @@ TomahawkWindow::onXSPFError( XSPFLoader::XSPFErrorCode error )
     JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( msg, 15 ) );
 }
 
+
 void
-TomahawkWindow::onJSPFError() {
+TomahawkWindow::onJSPFError()
+{
     JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( tr( "Failed to load JSPF playlist"), 15 ) );
 }
 
+
 void
 TomahawkWindow::onAudioEngineError( AudioEngine::AudioErrorCode /* error */ )
 {
     QString msg = tr( "Sorry, there is a problem accessing your audio device or the desired track, current track will be skipped." );
-
     tLog() << msg;
-
     JobStatusView::instance()->model()->addJob( new ErrorStatusMessage( msg, 15 ) );
-
-    if ( m_audioRetryCounter < 3 )
-        AudioEngine::instance()->play();
-    m_audioRetryCounter++;
 }
 
 
@@ -1347,8 +1343,6 @@ TomahawkWindow::createPlaylist()
 void
 TomahawkWindow::audioStarted()
 {
-    m_audioRetryCounter = 0;
-
     ActionCollection::instance()->getAction( "playPause" )->setIcon( ImageRegistry::instance()->icon( RESPATH "images/pause.svg" ) );
     ActionCollection::instance()->getAction( "playPause" )->setText( tr( "Pause" ) );
     ActionCollection::instance()->getAction( "stop" )->setEnabled( true );
diff --git a/src/tomahawk/TomahawkWindow.h b/src/tomahawk/TomahawkWindow.h
index 1e7cd0a36..75f58ac99 100644
--- a/src/tomahawk/TomahawkWindow.h
+++ b/src/tomahawk/TomahawkWindow.h
@@ -209,7 +209,6 @@ private:
 
     Tomahawk::result_ptr m_currentTrack;
     QString m_windowTitle;
-    int m_audioRetryCounter;
 };
 
 #endif // TOMAHAWKWINDOW_H