diff --git a/Applications/Piano/PianoWidget.cpp b/Applications/Piano/PianoWidget.cpp
index 0d63245a99..61af182c4c 100644
--- a/Applications/Piano/PianoWidget.cpp
+++ b/Applications/Piano/PianoWidget.cpp
@@ -6,9 +6,6 @@
 
 PianoWidget::PianoWidget()
 {
-    m_front_buffer = new Sample[2048];
-    m_back_buffer = new Sample[2048];
-
     set_font(Font::default_fixed_width_font());
 }
 
diff --git a/Applications/Piano/PianoWidget.h b/Applications/Piano/PianoWidget.h
index 57bbfc1c04..3605b5c4ce 100644
--- a/Applications/Piano/PianoWidget.h
+++ b/Applications/Piano/PianoWidget.h
@@ -57,8 +57,10 @@ private:
     int octave_base() const;
 
     int m_sample_count { 0 };
-    Sample* m_front_buffer { nullptr };
-    Sample* m_back_buffer { nullptr };
+    Sample m_front[2048] { 0, 0 };
+    Sample m_back[2048] { 0, 0 };
+    Sample* m_front_buffer { m_front };
+    Sample* m_back_buffer { m_back };
 
 #define note_count sizeof(note_frequency) / sizeof(double)