diff --git a/skyplane/broadcast/gateway/gateway_daemon_api.py b/skyplane/broadcast/gateway/gateway_daemon_api.py
index df22b61b9..78ac90c76 100644
--- a/skyplane/broadcast/gateway/gateway_daemon_api.py
+++ b/skyplane/broadcast/gateway/gateway_daemon_api.py
@@ -37,7 +37,7 @@ def __init__(
         gateway_receiver: GatewayReceiver,
         error_event,
         error_queue: Queue,
-        terminal_operators: Dict[str, List[str]] = None,
+        terminal_operators: Optional[Dict[str, List[str]]] = None,
         host="0.0.0.0",
         port=8081,
     ):
diff --git a/skyplane/broadcast/gateway/operators/gateway_operator.py b/skyplane/broadcast/gateway/operators/gateway_operator.py
index c931311b9..6e0772894 100644
--- a/skyplane/broadcast/gateway/operators/gateway_operator.py
+++ b/skyplane/broadcast/gateway/operators/gateway_operator.py
@@ -388,9 +388,9 @@ def __init__(
         error_event,
         error_queue: GatewayQueue,
         n_processes: int = 1,
-        chunk_store: ChunkStore = None,
-        bucket_name: str = None,
-        bucket_region: str = None,
+        chunk_store: Optional[ChunkStore] = None,
+        bucket_name: Optional[str] = None,
+        bucket_region: Optional[str] = None,
     ):
         super().__init__(handle, region, input_queue, output_queue, error_event, error_queue, chunk_store, n_processes)
         self.bucket_name = bucket_name
@@ -423,9 +423,9 @@ def __init__(
         error_event,
         error_queue: GatewayQueue,
         n_processes: int = 32,
-        chunk_store: ChunkStore = None,
-        bucket_name: str = None,
-        bucket_region: str = None,
+        chunk_store: Optional[ChunkStore] = None,
+        bucket_name: Optional[str] = None,
+        bucket_region: Optional[str] = None,
     ):
         super().__init__(
             handle, region, input_queue, output_queue, error_event, error_queue, n_processes, chunk_store, bucket_name, bucket_region
@@ -481,9 +481,9 @@ def __init__(
         error_event,
         error_queue: GatewayQueue,
         n_processes: int = 32,
-        chunk_store: ChunkStore = None,
-        bucket_name: str = None,
-        bucket_region: str = None,
+        chunk_store: Optional[ChunkStore] = None,
+        bucket_name: Optional[str] = None,
+        bucket_region: Optional[str] = None,
     ):
         super().__init__(
             handle, region, input_queue, output_queue, error_event, error_queue, n_processes, chunk_store, bucket_name, bucket_region