diff --git a/core/src/commonMain/kotlin/com/powersync/connectors/PowerSyncBackendConnector.kt b/core/src/commonMain/kotlin/com/powersync/connectors/PowerSyncBackendConnector.kt
index 08632477..73dde9fd 100644
--- a/core/src/commonMain/kotlin/com/powersync/connectors/PowerSyncBackendConnector.kt
+++ b/core/src/commonMain/kotlin/com/powersync/connectors/PowerSyncBackendConnector.kt
@@ -51,6 +51,7 @@ abstract class PowerSyncBackendConnector {
         fetchRequest = fetchRequest ?: GlobalScope.async {
             fetchCredentials().also { value ->
                 cachedCredentials = value
+                fetchRequest = null
             }
         }
 
diff --git a/core/src/commonMain/kotlin/com/powersync/sync/SyncStream.kt b/core/src/commonMain/kotlin/com/powersync/sync/SyncStream.kt
index a6014a6d..97714ac2 100644
--- a/core/src/commonMain/kotlin/com/powersync/sync/SyncStream.kt
+++ b/core/src/commonMain/kotlin/com/powersync/sync/SyncStream.kt
@@ -17,8 +17,10 @@ import io.ktor.client.request.get
 import io.ktor.client.request.headers
 import io.ktor.client.request.preparePost
 import io.ktor.client.request.setBody
+import io.ktor.client.statement.bodyAsText
 import io.ktor.http.ContentType
 import io.ktor.http.HttpHeaders
+import io.ktor.http.HttpStatusCode
 import io.ktor.http.contentType
 import io.ktor.utils.io.*
 import kotlinx.coroutines.delay
@@ -85,14 +87,22 @@ class SyncStream(
                     invalidCredentials = false
                 }
                 streamingSyncIteration()
+//                val state = streamingSyncIteration()
+//                TODO: We currently always retry
+//                if (!state.retry) {
+//                    break;
+//                }
             } catch (e: Exception) {
                 println("SyncStream::streamingSync Error: $e")
                 invalidCredentials = true
+                updateStatus(
+                    downloadError = e
+                )
+            } finally {
                 updateStatus(
                     connected = false,
                     connecting = true,
                     downloading = false,
-                    downloadError = e
                 )
                 delay(retryDelay)
             }
@@ -180,6 +190,14 @@ class SyncStream(
         }
 
         request.execute { httpResponse ->
+            if (httpResponse.status.value == 401) {
+                connector.invalidateCredentials()
+            }
+
+            if (httpResponse.status != HttpStatusCode.OK) {
+                throw RuntimeException("Received error when connecting to sync stream: ${httpResponse.bodyAsText()}")
+            }
+
             val channel: ByteReadChannel = httpResponse.body()
 
             while (!channel.isClosedForRead) {
@@ -191,7 +209,7 @@ class SyncStream(
         }
     }
 
-    private suspend fun streamingSyncIteration() {
+    private suspend fun streamingSyncIteration(): SyncStreamState {
         val bucketEntries = bucketStorage.getBucketStates()
         val initialBuckets = mutableMapOf<String, String>()
 
@@ -211,14 +229,11 @@ class SyncStream(
             buckets = initialBuckets.map { (bucket, after) -> BucketRequest(bucket, after) },
         )
 
-        streamingSyncRequest(req).retryWhen { cause, attempt ->
-            println("SyncStream::streamingSyncIteration Error: $cause")
-            delay(retryDelay)
-            println("SyncStream::streamingSyncIteration Retrying attempt: $attempt")
-            true
-        }.collect { value ->
+        streamingSyncRequest(req).collect { value ->
             handleInstruction(value, state)
         }
+
+        return state;
     }
 
     private suspend fun handleInstruction(
@@ -368,6 +383,7 @@ class SyncStream(
         if (tokenExpiresIn <= 0) {
             // Connection would be closed automatically right after this
             println("Token expiring reconnect")
+            connector.invalidateCredentials()
             state.retry = true
             return state
         }
diff --git a/demos/hello-powersync/iosApp/Podfile.lock b/demos/hello-powersync/iosApp/Podfile.lock
index 2f512b40..ebc94350 100644
--- a/demos/hello-powersync/iosApp/Podfile.lock
+++ b/demos/hello-powersync/iosApp/Podfile.lock
@@ -20,4 +20,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 4680f51fbb293d1385fb2467ada435cc1f16ab3d
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2
diff --git a/demos/hello-powersync/iosApp/iosApp/Info.plist b/demos/hello-powersync/iosApp/iosApp/Info.plist
index 412e3781..aaf5e182 100644
--- a/demos/hello-powersync/iosApp/iosApp/Info.plist
+++ b/demos/hello-powersync/iosApp/iosApp/Info.plist
@@ -2,6 +2,8 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>CADisableMinimumFrameDurationOnPhone</key>
+	<true/>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>$(DEVELOPMENT_LANGUAGE)</string>
 	<key>CFBundleExecutable</key>
@@ -20,8 +22,6 @@
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
-	<key>CADisableMinimumFrameDurationOnPhone</key>
-	<true/>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
diff --git a/gradle.properties b/gradle.properties
index fe49db18..2a9da6f5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@ development=true
 RELEASE_SIGNING_ENABLED=true
 # Library config
 GROUP=com.powersync
-LIBRARY_VERSION=0.0.1-ALPHA6
+LIBRARY_VERSION=0.0.1-ALPHA7
 GITHUB_REPO=https://github.com/powersync-ja/powersync-kotlin.git
 # POM
 POM_URL=https://github.com/powersync-ja/powersync-kotlin/