diff --git a/webcam/src/main/java/org/vaadin/teemu/webcam/client/WebcamStream.java b/webcam/src/main/java/org/vaadin/teemu/webcam/client/WebcamStream.java
index bd91df4..e61a30b 100644
--- a/webcam/src/main/java/org/vaadin/teemu/webcam/client/WebcamStream.java
+++ b/webcam/src/main/java/org/vaadin/teemu/webcam/client/WebcamStream.java
@@ -11,7 +11,8 @@ protected WebcamStream() {
     // @formatter:off
     
     public final native void stop() /*-{
-        this.stop();
+        this.getVideoTracks()[0].stop();
+		this.getAudioTracks()[0].stop();
     }-*/;
     
     // @formatter:on