diff --git a/include/SampleClip.h b/include/SampleClip.h
index fe158a2ce..2aa2c8c9d 100644
--- a/include/SampleClip.h
+++ b/include/SampleClip.h
@@ -65,7 +65,8 @@ public:
 
 	std::shared_ptr<Sample> sample()
 	{
-		return m_sample;
+		// TODO C++20: Deprecated, use std::atomic<std::shared_ptr> instead
+		return std::atomic_load(&m_sample);
 	}
 
 	TimePos sampleLength() const;