diff --git a/server/src/commands/serve.rs b/server/src/commands/serve.rs
index d074a116..ac2dab5a 100644
--- a/server/src/commands/serve.rs
+++ b/server/src/commands/serve.rs
@@ -39,9 +39,11 @@ pub fn serve(options: &ServeOptions) -> Result<(), ServeError> {
 
     let port = options
         .port
-        .or(maybe_project
-            .as_ref()
-            .and_then(|project| project.serve_port))
+        .or_else(|| {
+            maybe_project
+                .as_ref()
+                .and_then(|project| project.serve_port)
+        })
         .unwrap_or(DEFAULT_PORT);
 
     println!("Rojo server listening on port {}", port);