diff --git a/addon/components/paper-switch.js b/addon/components/paper-switch.js
index 304e5e2e2..beb5b1490 100644
--- a/addon/components/paper-switch.js
+++ b/addon/components/paper-switch.js
@@ -108,8 +108,14 @@ export default Component.extend(FocusableMixin, RippleMixin, ColorMixin, Proxiab
 
   },
 
-  _handleNativeClick() {
-    return get(this, 'bubbles');
+  _handleNativeClick(ev) {
+    let bubbles = get(this, 'bubbles');
+
+    if (!bubbles) {
+      ev.stopPropagation();
+    }
+
+    return bubbles;
   },
 
   _teardownSwitch() {