diff --git a/driver_loops.c b/driver_loops.c
index bb5216a..b935b4e 100644
--- a/driver_loops.c
+++ b/driver_loops.c
@@ -1014,7 +1014,9 @@ static void *uinput_poll_loop(void *arg){
 					}
 					default:{
 						pthread_mutex_lock(&loop_context->device_mutex);
-						lg4ff_play_effect(&loop_context->ffb_device, e.code, e.value, loop_context->context.log_effects);
+						if(!loop_context->context.play_on_upload || e.value != 1){
+							lg4ff_play_effect(&loop_context->ffb_device, e.code, e.value, loop_context->context.log_effects);
+						}
 						pthread_mutex_unlock(&loop_context->device_mutex);
 					}
 				}