diff --git a/include/ControllerConnection.h b/include/ControllerConnection.h
index 8b60b01b681..6b44e6723be 100644
--- a/include/ControllerConnection.h
+++ b/include/ControllerConnection.h
@@ -37,7 +37,6 @@
 #include "JournallingObject.h"
 #include "ValueBuffer.h"
 
-class AutomatableModel;
 class ControllerConnection;
 
 typedef QVector<ControllerConnection *> ControllerConnectionVector;
@@ -48,7 +47,7 @@ class LMMS_EXPORT ControllerConnection : public QObject, public JournallingObjec
 	Q_OBJECT
 public:
 
-	ControllerConnection(Controller * _controller, AutomatableModel * contmod);
+	ControllerConnection(Controller * _controller);
 	ControllerConnection( int _controllerId );
 
 	virtual ~ControllerConnection();
@@ -112,8 +111,6 @@ public slots:
 
 	static ControllerConnectionVector s_connections;
 
-	AutomatableModel * m_controlledModel;
-
 signals:
 	// The value changed while the mixer isn't running (i.e: MIDI CC)
 	void valueChanged();
diff --git a/src/core/AutomatableModel.cpp b/src/core/AutomatableModel.cpp
index 9e6cb3cef3f..2c1162e0d18 100644
--- a/src/core/AutomatableModel.cpp
+++ b/src/core/AutomatableModel.cpp
@@ -215,7 +215,7 @@ void AutomatableModel::loadSettings( const QDomElement& element, const QString&
 		}
 		if( thisConnection.isElement() )
 		{
-			setControllerConnection(new ControllerConnection((Controller*)NULL, this));
+			setControllerConnection(new ControllerConnection(nullptr));
 			m_controllerConnection->loadSettings( thisConnection.toElement() );
 			//m_controllerConnection->setTargetName( displayName() );
 		}
diff --git a/src/core/ControllerConnection.cpp b/src/core/ControllerConnection.cpp
index b8fe4b30244..7a736559177 100644
--- a/src/core/ControllerConnection.cpp
+++ b/src/core/ControllerConnection.cpp
@@ -36,11 +36,10 @@ ControllerConnectionVector ControllerConnection::s_connections;
 
 
 
-ControllerConnection::ControllerConnection(Controller * _controller, AutomatableModel * contmod) :
+ControllerConnection::ControllerConnection(Controller * _controller) :
 	m_controller( NULL ),
 	m_controllerId( -1 ),
-	m_ownsController(false),
-	m_controlledModel(contmod)
+	m_ownsController(false)
 {
 	if( _controller != NULL )
 	{
@@ -124,12 +123,6 @@ void ControllerConnection::setController( Controller * _controller )
 	m_ownsController =
 		(_controller->type() == Controller::MidiController);
 
-	connect(Engine::getSong(), SIGNAL(stopped()),
-		m_controlledModel, SLOT(setUseControllerValue()),
-			Qt::UniqueConnection);
-
-	m_controlledModel->setUseControllerValue(true);
-
 	// If we don't own the controller, allow deletion of controller
 	// to delete the connection
 	if( !m_ownsController ) {
diff --git a/src/core/Song.cpp b/src/core/Song.cpp
index ac6fed6b37a..2800f829b17 100644
--- a/src/core/Song.cpp
+++ b/src/core/Song.cpp
@@ -407,15 +407,12 @@ void Song::processAutomations(const TrackList &tracklist, TimePos timeStart, fpp
 
 	// Checks if an automated model stopped being automated by automation patterns
 	// so we can move the control back to any connected controller again
-	if (!m_oldAutomatedValues.isEmpty())
+	for (auto it = m_oldAutomatedValues.begin(); it != m_oldAutomatedValues.end(); it++)
 	{
-		for (auto it = m_oldAutomatedValues.begin(); it != m_oldAutomatedValues.end(); it++)
+		AutomatableModel * am = it.key();
+		if (am->controllerConnection() && !values.contains(am))
 		{
-			AutomatableModel * am = it.key();
-			if (am->controllerConnection() && !values.contains(am))
-			{
-				am->setUseControllerValue(true);
-			}
+			am->setUseControllerValue(true);
 		}
 	}
 	m_oldAutomatedValues = values;
@@ -639,6 +636,9 @@ void Song::stop()
 		return;
 	}
 
+	// To avoid race conditions with the processing threads
+	Engine::mixer()->requestChangeInModel();
+
 	TimeLineWidget * tl = m_playPos[m_playMode].m_timeLine;
 	m_paused = false;
 	m_recording = true;
@@ -687,8 +687,19 @@ void Song::stop()
 	// remove all note-play-handles that are active
 	Engine::mixer()->clear();
 
+	// Moves the control of the models that were processed on the last frame
+	// back to their controllers.
+	for (auto it = m_oldAutomatedValues.begin(); it != m_oldAutomatedValues.end(); it++)
+	{
+		AutomatableModel * am = it.key();
+		am->setUseControllerValue(true);
+	}
+	m_oldAutomatedValues.clear();
+
 	m_playMode = Mode_None;
 
+	Engine::mixer()->doneChangeInModel();
+
 	emit stopped();
 	emit playbackStateChanged();
 }
@@ -886,6 +897,9 @@ void Song::clearProject()
 	m_masterPitchModel.reset();
 	m_timeSigModel.reset();
 
+	// Clear the m_oldAutomatedValues AutomatedValueMap
+	m_oldAutomatedValues.clear();
+
 	AutomationPattern::globalAutomationPattern( &m_tempoModel )->clear();
 	AutomationPattern::globalAutomationPattern( &m_masterVolumeModel )->
 									clear();
diff --git a/src/gui/AutomatableModelView.cpp b/src/gui/AutomatableModelView.cpp
index 1f26580a408..8cf3a4ab04d 100644
--- a/src/gui/AutomatableModelView.cpp
+++ b/src/gui/AutomatableModelView.cpp
@@ -33,7 +33,6 @@
 #include "embed.h"
 #include "GuiApplication.h"
 #include "MainWindow.h"
-#include "Song.h"
 #include "StringPairDrag.h"
 #include "Clipboard.h"
 
@@ -229,7 +228,7 @@ void AutomatableModelViewSlots::execConnectionDialog()
 			// New
 			else
 			{
-				ControllerConnection* cc = new ControllerConnection(d.chosenController(), m);
+				ControllerConnection* cc = new ControllerConnection(d.chosenController());
 				m->setControllerConnection( cc );
 				//cc->setTargetName( m->displayName() );
 			}
@@ -251,12 +250,8 @@ void AutomatableModelViewSlots::removeConnection()
 
 	if( m->controllerConnection() )
 	{
-		disconnect(Engine::getSong(), SIGNAL(stopped()),
-			   m, SLOT(setUseControllerValue()));
-
 		delete m->controllerConnection();
 		m->setControllerConnection( NULL );
-		emit m->dataChanged();
 	}
 }