diff --git a/src/RotCtl.zig b/src/RotCtl.zig
index f6db38a..a07e01a 100644
--- a/src/RotCtl.zig
+++ b/src/RotCtl.zig
@@ -33,7 +33,7 @@ pub fn run(allocator: std.mem.Allocator) !void {
         .rotator = try YaesuController.init(allocator),
     };
 
-    while (true) {
+    while (interface.running) {
         const client = try server.accept();
         defer {
             log.info("disconnecting client", .{});
@@ -42,8 +42,6 @@ pub fn run(allocator: std.mem.Allocator) !void {
         }
 
         interface.writer = .{ .unbuffered_writer = client.stream.writer() };
-        interface.running = true;
-        defer interface.running = false;
 
         log.info("client connected from {}", .{client.address});