diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 1e90f6983..6d1449613 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -550,30 +550,6 @@ steps:
     concurrency_group: 'bitbar-app'
     concurrency_method: eager
 
-  - label: ':bitbar: Temp test'
-    depends_on: "cocoa_fixture"
-    timeout_in_minutes: 20
-    agents:
-      queue: opensource
-    plugins:
-      artifacts#v1.9.0:
-        download: "features/fixtures/ios/output/iOSTestApp.ipa"
-        upload: "maze_output/failed/**/*"
-      docker-compose#v4.7.0:
-        pull: cocoa-maze-runner-bitbar
-        run: cocoa-maze-runner-bitbar
-        service-ports: true
-        command:
-          - "--app=/app/build/iOSTestApp.ipa"
-          - "--farm=bb"
-          - "--device=IOS_15"
-          - "--no-tunnel"
-          - "--aws-public-ip"
-          - "features/app_and_device_attributes.feature:6"
-    concurrency: 25
-    concurrency_group: 'bitbar-app'
-    concurrency_method: eager
-
   ##############################################################################
   #
   # Trigger more tests
diff --git a/features/fixtures/ios/iOSTestApp/ViewController.swift b/features/fixtures/ios/iOSTestApp/ViewController.swift
index 954421598..5620f94e6 100644
--- a/features/fixtures/ios/iOSTestApp/ViewController.swift
+++ b/features/fixtures/ios/iOSTestApp/ViewController.swift
@@ -36,10 +36,10 @@ class ViewController: UIViewController {
 
         // Poll for commands to run
         if #available(iOS 10.0, *) {
-            if Scenario.baseMazeAddress.isEmpty {
-                Scenario.baseMazeAddress = loadMazeRunnerAddress()
-            }
-                Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { timer in
+            Timer.scheduledTimer(withTimeInterval: 1, repeats: true) { timer in
+                if Scenario.baseMazeAddress.isEmpty {
+                    Scenario.baseMazeAddress = self.loadMazeRunnerAddress()
+                }
                 Scenario.executeMazeRunnerCommand { _, scenarioName, eventMode in
                     log("Setting field values")
                     self.scenarioNameField.text = scenarioName