diff --git a/build.gradle b/build.gradle
index 39d30cc..a104d8f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta2'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }
@@ -65,7 +65,7 @@ android {
 dependencies {
     api 'com.google.zxing:core:3.3.0'
     api 'com.google.zxing:android-core:3.3.0'
-    api 'com.android.support:support-annotations:26.0.1'
+    api 'com.android.support:support-annotations:26.0.2'
 }
 
 group = publishedGroupId
diff --git a/src/main/java/com/budiyev/android/codescanner/CodeScanner.java b/src/main/java/com/budiyev/android/codescanner/CodeScanner.java
index 6f665dd..40438c0 100644
--- a/src/main/java/com/budiyev/android/codescanner/CodeScanner.java
+++ b/src/main/java/com/budiyev/android/codescanner/CodeScanner.java
@@ -298,17 +298,16 @@ private void autoFocusCamera() {
         }
         if (mFocusing && mFocusAttemptsCount < FOCUS_ATTEMPTS_THRESHOLD) {
             mFocusAttemptsCount++;
-            scheduleAutoFocusTask();
-            return;
-        }
-        try {
-            mCamera.autoFocus(mAutoFocusCallback);
-            mFocusAttemptsCount = 0;
-            mFocusing = true;
-        } catch (Exception e) {
-            mFocusing = false;
-            scheduleAutoFocusTask();
+        } else {
+            try {
+                mCamera.autoFocus(mAutoFocusCallback);
+                mFocusAttemptsCount = 0;
+                mFocusing = true;
+            } catch (Exception e) {
+                mFocusing = false;
+            }
         }
+        scheduleAutoFocusTask();
     }
 
     private void scheduleAutoFocusTask() {
@@ -423,7 +422,6 @@ private final class AutoFocusCallback implements Camera.AutoFocusCallback {
         @Override
         public void onAutoFocus(boolean success, Camera camera) {
             mFocusing = false;
-            scheduleAutoFocusTask();
         }
     }