diff --git a/src/com/pheelicks/visualizer/VisualizerView.java b/src/com/pheelicks/visualizer/VisualizerView.java
index 78e047e..e070cf2 100644
--- a/src/com/pheelicks/visualizer/VisualizerView.java
+++ b/src/com/pheelicks/visualizer/VisualizerView.java
@@ -83,7 +83,12 @@ public void link(MediaPlayer player)
     }
 
     // Create the Visualizer object and attach it to our media player.
+    if(mVisualizer != null) 
+    {
+      release();
+    }
     mVisualizer = new Visualizer(player.getAudioSessionId());
+    mVisualizer.setEnabled(false);
     mVisualizer.setCaptureSize(Visualizer.getCaptureSizeRange()[1]);
 
     // Pass through Visualizer data to VisualizerView
@@ -223,4 +228,4 @@ protected void onDraw(Canvas canvas) {
 
     canvas.drawBitmap(mCanvasBitmap, new Matrix(), null);
   }
-}
\ No newline at end of file
+}