diff --git a/universal7885-common/hardware/samsung/vibrator/Vibrator.cpp b/universal7885-common/hardware/samsung/vibrator/Vibrator.cpp
index 778b242..fea147d 100644
--- a/universal7885-common/hardware/samsung/vibrator/Vibrator.cpp
+++ b/universal7885-common/hardware/samsung/vibrator/Vibrator.cpp
@@ -168,6 +168,11 @@ ndk::ScopedAStatus Vibrator::setAmplitude(float amplitude) {
   if (intensity > INTENSITY_MAX) {
     intensity = INTENSITY_MAX;
   }
+
+  if (intensity == 0) {
+    return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
+  }
+
   LOG(DEBUG) << "Setting intensity: " << intensity;
 
   if (mHasTimedOutIntensity) {