diff --git a/src/prep.py b/src/prep.py
index 678786f7..7dad430e 100644
--- a/src/prep.py
+++ b/src/prep.py
@@ -2473,9 +2473,10 @@ def calculate_piece_size(cls, total_size, min_size, max_size, files):
                 elif num_pieces > 2000:
                     piece_size *= 2
                     if piece_size > our_max_size:
-                        cli_ui.warning(f"Warning: Piece size exceeded 2000 pieces and .torrent will be approximately {torrent_file_size / 1024:.2f} KiB! Using ({num_pieces}) pieces.")
                         piece_size = our_max_size
                         break
+                    elif torrent_file_size > 92160:  # Break if .torrent size exceeds 90 KiB
+                        break
                 elif torrent_file_size > 102400:
                     cli_ui.warning('WARNING: .torrent size will exceed 100 KiB!')
                     piece_size *= 2