diff --git a/aider/main.py b/aider/main.py
index 293b6cbff..d8a90dfe8 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -577,6 +577,11 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
         args.map_refresh = "files"
 
     try:
+        if not main_model.streaming:
+            if args.stream:
+                io.tool_warning("Warning: Streaming is not supported by the selected model. Disabling streaming.")
+            args.stream = False
+
         coder = Coder.create(
             main_model=main_model,
             edit_format=args.edit_format,