diff --git a/Source/Standalone/InternalSynth.h b/Source/Standalone/InternalSynth.h
index 137098d9c..e83ddccec 100644
--- a/Source/Standalone/InternalSynth.h
+++ b/Source/Standalone/InternalSynth.h
@@ -40,12 +40,12 @@ class InternalSynth final : public Thread {
     FluidSynth* synth = nullptr;
     FluidSettings* settings = nullptr;
 
-    std::atomic<bool> ready = false;
+    AtomicValue<bool> ready = false;
     std::mutex unprepareLock;
 
-    std::atomic<int> lastSampleRate = 0;
-    std::atomic<int> lastBlockSize = 0;
-    std::atomic<int> lastNumChannels = 0;
+    AtomicValue<int> lastSampleRate = 0;
+    AtomicValue<int> lastBlockSize = 0;
+    AtomicValue<int> lastNumChannels = 0;
 
     AudioBuffer<float> internalBuffer;
 };
diff --git a/Source/Utility/MidiDeviceManager.h b/Source/Utility/MidiDeviceManager.h
index a58c53219..cda027f5a 100644
--- a/Source/Utility/MidiDeviceManager.h
+++ b/Source/Utility/MidiDeviceManager.h
@@ -428,16 +428,16 @@ class MidiDeviceManager final : public ChangeListener
     }
 
     float currentSampleRate = 44100.f;
-    std::atomic<float> lastCallbackTime = 0.0f;
+    AtomicValue<float> lastCallbackTime = 0.0f;
 
     struct MidiInputPort {
-        std::atomic<bool> enabled = false;
+        AtomicValue<bool> enabled = false;
         OwnedArray<MidiInput> devices;
         moodycamel::ConcurrentQueue<std::pair<MidiMessage, int>> queue;
     };
 
     struct MidiOutputPort {
-        std::atomic<bool> enabled = false;
+        AtomicValue<bool> enabled = false;
         OwnedArray<MidiOutput> devices;
         // We need this queue because we are not inside the global Pd lock, and MIDI data can be enqueued from the message thread (but inside the audio lock)
         moodycamel::ConcurrentQueue<std::pair<MidiMessage, int>> queue;