diff --git a/ext/remote_config.c b/ext/remote_config.c
index a6600b6f62..d3fe8bde31 100644
--- a/ext/remote_config.c
+++ b/ext/remote_config.c
@@ -99,9 +99,10 @@ static zend_string *dd_dynamic_configuration_update(ddog_CharSlice config, zend_
         }
     } else {
         ZEND_ASSERT(mode == DDOG_DYNAMIC_CONFIG_UPDATE_MODE_WRITE);
-        DDTRACE_G(remote_config_writing) = true;
+        ddog_RemoteConfigState *saved = DDTRACE_G(remote_config_state);
+        DDTRACE_G(remote_config_state) = NULL;
         zend_alter_ini_entry(name, value, ZEND_INI_USER, ZEND_INI_STAGE_RUNTIME);
-        DDTRACE_G(remote_config_writing) = false;
+        DDTRACE_G(remote_config_state) = saved;
         zend_string_release(value);
     }
     zend_string_release(name);
diff --git a/tests/ext/request-replayer/dd_trace_agent_env.phpt b/tests/ext/request-replayer/dd_trace_agent_env.phpt
index 50de644e70..93b4832543 100644
--- a/tests/ext/request-replayer/dd_trace_agent_env.phpt
+++ b/tests/ext/request-replayer/dd_trace_agent_env.phpt
@@ -37,11 +37,10 @@ $rr = new RequestReplayer();
 $span = \DDTrace\start_span();
 
 // make sure sidecar keeps up with us
-$start = microtime(true);
 \DDTrace\start_trace_span();
 \DDTrace\close_span();
 $rr->waitForDataAndReplay();
-usleep(floor(microtime(true) - $start) * 100000);
+dd_trace_internal_fn('await_agent_info', 15000);
 
 \DDTrace\close_span();
 var_dump($span->env);