diff --git a/vibrator/cs40l26/Vibrator.cpp b/vibrator/cs40l26/Vibrator.cpp
index ac2d4d7..cc4b97f 100644
--- a/vibrator/cs40l26/Vibrator.cpp
+++ b/vibrator/cs40l26/Vibrator.cpp
@@ -408,6 +408,7 @@ ndk::ScopedAStatus Vibrator::off() {
     const std::scoped_lock<std::mutex> lock(mActiveId_mutex);
 
     if (mActiveId >= 0) {
+        ALOGV("Off: Stop the active effect: %d", mActiveId);
         /* Stop the active effect. */
         if (!mHwApi->setFFPlay(mInputFd, mActiveId, false)) {
             ALOGE("Failed to stop effect %d (%d): %s", mActiveId, errno, strerror(errno));
@@ -1391,6 +1392,7 @@ void Vibrator::waitForComplete(std::shared_ptr<IVibratorCallback> &&callback) {
         }
         mSyncedCallback = nullptr;
     }
+    ALOGV("waitForComplete: Done");
 }
 
 uint32_t Vibrator::intensityToVolLevel(float intensity, uint32_t effectIndex) {
diff --git a/vibrator/cs40l26/VibratorManager.cpp b/vibrator/cs40l26/VibratorManager.cpp
index 64dbe67..b6c1b48 100644
--- a/vibrator/cs40l26/VibratorManager.cpp
+++ b/vibrator/cs40l26/VibratorManager.cpp
@@ -114,7 +114,8 @@ ndk::ScopedAStatus VibratorManager::prepareSynced(const std::vector<int32_t> &id
         if (ext->prepareSynced(callback).isOk()) {
             mSyncContext.emplace_back(id, callback->getFuture());
         } else {
-            ALOGV("prepareSynced: Fail");
+            cancelSynced();
+            ALOGV("prepareSynced: Fail: %d", id);
             return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_STATE);
         }
     }