diff --git a/plugins/TripleOscillator/TripleOscillator.cpp b/plugins/TripleOscillator/TripleOscillator.cpp
index a6f03246e..c8d7942a7 100644
--- a/plugins/TripleOscillator/TripleOscillator.cpp
+++ b/plugins/TripleOscillator/TripleOscillator.cpp
@@ -262,8 +262,8 @@ void TripleOscillator::saveSettings( QDomDocument & _doc, QDomElement & _this )
 					"modalgo" + QString::number( i+1 ) );
 		m_osc[i]->m_useWaveTableModel.saveSettings( _doc, _this,
 					"useWaveTable" + QString::number (i+1 ) );
-		_this.setAttribute( "userwavefile" + is,
-					m_osc[i]->m_sampleBuffer->audioFile() );
+		// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
+		_this.setAttribute("userwavefile" + is, std::atomic_load(&m_osc[i]->m_sampleBuffer)->audioFile());
 	}
 }
 
@@ -364,8 +364,9 @@ void TripleOscillator::playNote( NotePlayHandle * _n,
 				oscs_r[i]->setUseWaveTable(m_osc[i]->m_useWaveTable);
 			}
 
-			oscs_l[i]->setUserWave( m_osc[i]->m_sampleBuffer );
-			oscs_r[i]->setUserWave( m_osc[i]->m_sampleBuffer );
+			// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
+			oscs_l[i]->setUserWave(std::atomic_load(&m_osc[i]->m_sampleBuffer));
+			oscs_r[i]->setUserWave(std::atomic_load(&m_osc[i]->m_sampleBuffer));
 
 		}
 
diff --git a/src/core/LfoController.cpp b/src/core/LfoController.cpp
index 9580b7f27..7aeee65a6 100644
--- a/src/core/LfoController.cpp
+++ b/src/core/LfoController.cpp
@@ -197,7 +197,8 @@ void LfoController::saveSettings( QDomDocument & _doc, QDomElement & _this )
 	m_phaseModel.saveSettings( _doc, _this, "phase" );
 	m_waveModel.saveSettings( _doc, _this, "wave" );
 	m_multiplierModel.saveSettings( _doc, _this, "multiplier" );
-	_this.setAttribute( "userwavefile" , m_userDefSampleBuffer->audioFile() );
+	// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
+	_this.setAttribute("userwavefile", std::atomic_load(&m_userDefSampleBuffer)->audioFile());
 }