diff --git a/src/api-service/__app__/onefuzzlib/proxy.py b/src/api-service/__app__/onefuzzlib/proxy.py
index 5e58ab3cc..0f822436f 100644
--- a/src/api-service/__app__/onefuzzlib/proxy.py
+++ b/src/api-service/__app__/onefuzzlib/proxy.py
@@ -165,7 +165,9 @@ class Proxy(ORMMixin):
             self.stopped()
 
     def stopped(self) -> None:
+        self.set_state(VmState.stopped)
         logging.info(PROXY_LOG_PREFIX + "removing proxy: %s", self.region)
+        send_event(EventProxyDeleted(region=self.region, proxy_id=self.proxy_id))
         self.delete()
 
     def is_outdated(self) -> bool:
@@ -303,10 +305,6 @@ class Proxy(ORMMixin):
         send_event(EventProxyCreated(region=region, proxy_id=proxy.proxy_id))
         return proxy
 
-    def delete(self) -> None:
-        super().delete()
-        send_event(EventProxyDeleted(region=self.region, proxy_id=self.proxy_id))
-
     def set_state(self, state: VmState) -> None:
         if self.state == state:
             return
diff --git a/src/api-service/__app__/timer_proxy/__init__.py b/src/api-service/__app__/timer_proxy/__init__.py
index 22a2dbd74..454799a6b 100644
--- a/src/api-service/__app__/timer_proxy/__init__.py
+++ b/src/api-service/__app__/timer_proxy/__init__.py
@@ -41,7 +41,7 @@ def main(mytimer: func.TimerRequest, dashboard: func.Out[str]) -> None:  # noqa:
             )
             process_state_updates(proxy)
 
-        if proxy.is_outdated():
+        if proxy.state != VmState.stopped and proxy.is_outdated():
             proxy.outdated = True
             proxy.save()