diff --git a/src/wave.h b/src/wave.h
index 26a2587..d2df340 100644
--- a/src/wave.h
+++ b/src/wave.h
@@ -37,6 +37,12 @@ public:
     m_tp = newWave.m_tp;
   }
 
+  ~Wave()
+  {
+    delete m_tp;
+    m_tp = nullptr;
+  }
+
   /*! ID getter */
   uint16_t getId() { return m_cid; }
 
diff --git a/src/wavetable.h b/src/wavetable.h
index 90ca0a9..c30db47 100644
--- a/src/wavetable.h
+++ b/src/wavetable.h
@@ -31,6 +31,11 @@ public:
     m_wtp = new Wave[DEFAULT_N_WAVES];
   }
 
+  ~Wavetable() {
+    delete m_wtp;
+    m_wtp = nullptr;
+  }
+
   /*! ID getter */
   uint16_t getId() { return m_cid; }