diff --git a/src/Mod/BIM/Arch.py b/src/Mod/BIM/Arch.py
index 979ff4c888..a017c96181 100644
--- a/src/Mod/BIM/Arch.py
+++ b/src/Mod/BIM/Arch.py
@@ -794,7 +794,12 @@ def makePipeConnector(pipes, radius=0, name=None):
 
     # Initialize all relevant properties
     pipeConnector.Pipes = pipes
-    pipeConnector.Radius = radius if radius else pipes[0].Diameter
+    if radius:
+        pipeConnector.Radius = radius
+    elif pipes[0].ProfileType == "Circle":
+        pipeConnector.Radius = pipes[0].Diameter
+    else:
+        pipeConnector.Radius = max(pipes[0].Height, pipes[0].Width)
 
     return pipeConnector
 
@@ -1933,4 +1938,4 @@ def _initializeArchObject(
         FreeCAD.Console.PrintError(f"Failed to import module '{moduleName}': {e}\n")
         return None
 
-    return obj
\ No newline at end of file
+    return obj