diff --git a/Corona-Warn-App/build.gradle b/Corona-Warn-App/build.gradle
index f8629ef63edd7f102d4630497d501a95ef7bfd26..5f9be100894f453a47b45502b8a32ce2305f93a7 100644
--- a/Corona-Warn-App/build.gradle
+++ b/Corona-Warn-App/build.gradle
@@ -252,6 +252,9 @@ dependencies {
     // noinspection GradleDependency - needed for SDK 23 compatibility, in combination with com.journeyapps:zxing-android-embedded:4.1.0
     implementation 'com.google.zxing:core:3.3.0'
 
+    //ENA
+    implementation files('libs\\play-services-nearby-exposurenotification-1.6.1-eap.aar')
+
     // Testing
     testImplementation "android.arch.core:core-testing:1.1.1"
     testImplementation('org.robolectric:robolectric:4.3.1') {
@@ -290,7 +293,6 @@ dependencies {
     implementation 'com.google.android.gms:play-services-basement:17.3.0'
     implementation 'com.google.android.gms:play-services-safetynet:17.0.0'
     implementation 'com.google.android.gms:play-services-tasks:17.1.0'
-    api fileTree(dir: 'libs', include: ['play-services-nearby-18.0.3-eap.aar'])
 
     // HTTP
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
diff --git a/Corona-Warn-App/libs/play-services-nearby-18.0.3-eap.aar b/Corona-Warn-App/libs/play-services-nearby-18.0.3-eap.aar
deleted file mode 100644
index e962ff05fe26d42afcad95658a864d98995b0df8..0000000000000000000000000000000000000000
Binary files a/Corona-Warn-App/libs/play-services-nearby-18.0.3-eap.aar and /dev/null differ
diff --git a/Corona-Warn-App/libs/play-services-nearby-exposurenotification-1.6.1-eap.aar b/Corona-Warn-App/libs/play-services-nearby-exposurenotification-1.6.1-eap.aar
new file mode 100644
index 0000000000000000000000000000000000000000..6eddb67adf1c8419af03a6c68153ba5dbb7397b1
Binary files /dev/null and b/Corona-Warn-App/libs/play-services-nearby-exposurenotification-1.6.1-eap.aar differ
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/InternalExposureNotificationClient.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/InternalExposureNotificationClient.kt
index efa21ac87851bb24c84cfb90e7683f4f5c859f3e..09116212874bca048077fac935e2368b015ce8d9 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/InternalExposureNotificationClient.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/nearby/InternalExposureNotificationClient.kt
@@ -160,4 +160,11 @@ object InternalExposureNotificationClient {
                     cont.resumeWithException(it)
                 }
         }
+
+    /**
+     * Indicates if device supports scanning without location service
+     *
+     * @return
+     */
+    fun deviceSupportsLocationlessScanning() = exposureNotificationClient.deviceSupportsLocationlessScanning()
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
index 4b2ecd44e629cae210a90b9bd7fbe4ef09405346..9fbc8cd81d80605c94514cbfb48372ded0b9f52c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainActivity.kt
@@ -13,6 +13,7 @@ import androidx.lifecycle.lifecycleScope
 import dagger.android.AndroidInjection
 import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.http.playbook.BackgroundNoise
+import de.rki.coronawarnapp.nearby.InternalExposureNotificationClient
 import de.rki.coronawarnapp.storage.LocalData
 import de.rki.coronawarnapp.ui.viewmodel.SettingsViewModel
 import de.rki.coronawarnapp.util.ConnectivityHelper
@@ -21,6 +22,7 @@ import de.rki.coronawarnapp.util.ExternalActionHelper
 import de.rki.coronawarnapp.util.PowerManagementHelper
 import de.rki.coronawarnapp.worker.BackgroundWorkScheduler
 import kotlinx.coroutines.launch
+import timber.log.Timber
 
 /**
  * This activity holds all the fragments (except onboarding) and also registers a listener for
@@ -79,7 +81,9 @@ class MainActivity : AppCompatActivity() {
         }
 
         override fun onLocationUnavailable() {
-            settingsViewModel.updateLocationEnabled(false)
+            val canIgnoreLocationEnabled = InternalExposureNotificationClient.deviceSupportsLocationlessScanning()
+            settingsViewModel.updateLocationEnabled(canIgnoreLocationEnabled)
+            Timber.d("Location unavailable but can be ignored? $canIgnoreLocationEnabled")
         }
     }