diff --git a/server/app/query/view/[id]/components.tsx b/server/app/query/view/[id]/components.tsx
index 2cacdc8..5aaf35a 100644
--- a/server/app/query/view/[id]/components.tsx
+++ b/server/app/query/view/[id]/components.tsx
@@ -86,7 +86,7 @@ export function RunTimePill({
     if (startTime === null) {
       setRunTime(null);
     } else {
-      if (endTime !== null && startTime !== null) {
+      if (endTime !== null) {
         setRunTime(endTime - startTime);
       } else {
         let newIntervalId = setInterval(() => {
diff --git a/sidecar/app/query/base.py b/sidecar/app/query/base.py
index 20c3c2d..25fb50a 100644
--- a/sidecar/app/query/base.py
+++ b/sidecar/app/query/base.py
@@ -21,6 +21,9 @@ class QueryExistsError(Exception):
     pass
 
 
+StatusChangeEvent = namedtuple("StatusChangeEvent", ["status", "timestamp"])
+
+
 @dataclass
 class Query:
     query_id: str