diff --git a/index.js b/index.js
index 5f21fd4a5b55dda02ad3a6152a17bd19b416b48c..a522baacf5bbb7ee246af439c4711699339b29c1 100644
--- a/index.js
+++ b/index.js
@@ -43,9 +43,15 @@ function listenToButton( bdAddr ) {
     client.addConnectionChannel( cc );
 
     cc.on( 'buttonUpOrDown', function( clickType, wasQueued, timeDiff ) {
-        if ( 'ButtonDown' === clickType && false === wasQueued ) {
-            buttonActivated( bdAddr );
+        if ( 'ButtonDown' !== clickType ) {
+            return;
         }
+
+        if ( wasQueued && timeDiff > 2 ) {
+            return;
+        }
+
+        buttonActivated( bdAddr );
     } );
 }