diff --git a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/FakeLocationStateUseCase.kt b/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/FakeLocationStateUseCase.kt
index d0f5460899fea48abc52f168fe11537285929c6e..5446d3becbfa26a674d8b7d8678d542adcd83539 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/FakeLocationStateUseCase.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/domain/usecases/FakeLocationStateUseCase.kt
@@ -24,7 +24,6 @@ import android.location.Location
 import android.location.LocationListener
 import android.location.LocationManager
 import android.os.Bundle
-import android.os.Looper
 import android.util.Log
 import foundation.e.privacycentralapp.data.repositories.LocalStateRepository
 import foundation.e.privacycentralapp.domain.entities.LocationMode
@@ -177,9 +176,14 @@ class FakeLocationStateUseCase(
                 LocationManager.NETWORK_PROVIDER, // TODO: tight this with fakelocation module.
                 0L,
                 0f,
-                listener,
-                Looper.getMainLooper()
-                )
+                listener
+            )
+            // locationManager.requestLocationUpdates(
+            //     LocationManager.NETWORK_PROVIDER, // TODO: tight this with fakelocation module.
+            //     0L,
+            //     0f,
+            //     listener
+            // )
 
             val location: Location? = locationManager.getLastKnownLocation(LocationManager.NETWORK_PROVIDER)
             location?.let { listener.onLocationChanged(it) }
diff --git a/flow-mvi/src/main/java/foundation/e/flowmvi/feature/BaseFeature.kt b/flow-mvi/src/main/java/foundation/e/flowmvi/feature/BaseFeature.kt
index e3dd25795b14d929fd7081b8f8aa37cab45a0eb1..1429d1a0f1926adbadfdc2f7c437d5463cce093d 100644
--- a/flow-mvi/src/main/java/foundation/e/flowmvi/feature/BaseFeature.kt
+++ b/flow-mvi/src/main/java/foundation/e/flowmvi/feature/BaseFeature.kt
@@ -23,8 +23,6 @@ import foundation.e.flowmvi.MVIView
 import foundation.e.flowmvi.Reducer
 import foundation.e.flowmvi.SingleEventProducer
 import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
@@ -105,12 +103,11 @@ open class BaseFeature<State : Any, in Action : Any, in Effect : Any, SingleEven
     }
 
     private suspend fun Flow<Action>.collectIntoHandler(
-        @Suppress("UNUSED_PARAMETER")callerCoroutineScope: CoroutineScope,
+        callerCoroutineScope: CoroutineScope,
         @Suppress("UNUSED_PARAMETER") logger: Logger
     ) {
-        val scope = CoroutineScope(Dispatchers.IO + Job())
         onEach { action ->
-            scope.launch {
+            callerCoroutineScope.launch {
                 actor.invoke(_state.value, action)
                     .onEach { effect ->
                         mutex.withLock {
@@ -125,9 +122,9 @@ open class BaseFeature<State : Any, in Action : Any, in Effect : Any, SingleEven
                             }
                         }
                     }
-                    .launchIn(scope)
+                    .launchIn(coroutineScope)
             }
         }
-            .launchIn(scope)
+            .launchIn(callerCoroutineScope)
     }
 }