diff --git a/site/src/modules/resources/PortForwardButton.tsx b/site/src/modules/resources/PortForwardButton.tsx
index b46f3d2431..555d89f82d 100644
--- a/site/src/modules/resources/PortForwardButton.tsx
+++ b/site/src/modules/resources/PortForwardButton.tsx
@@ -205,21 +205,15 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
   const canSharePortsPublic =
     canSharePorts && template.max_port_share_level === "public";
 
-  const publicMenuItem = (
-    <>
-      {canSharePortsPublic ? (
-        <MenuItem value="public">Public</MenuItem>
-      ) : (
-        <Tooltip title="This workspace template does not allow sharing ports with unauthenticated users.">
-          {/* Tooltips don't work directly on disabled MenuItem components so you must wrap in div. */}
-          <div>
-            <MenuItem value="public" disabled>
-              Public
-            </MenuItem>
-          </div>
-        </Tooltip>
-      )}
-    </>
+  const disabledPublicMenuItem = (
+    <Tooltip title="This workspace template does not allow sharing ports with unauthenticated users.">
+      {/* Tooltips don't work directly on disabled MenuItem components so you must wrap in div. */}
+      <div>
+        <MenuItem value="public" disabled>
+          Public
+        </MenuItem>
+      </div>
+    </Tooltip>
   );
 
   return (
@@ -447,7 +441,11 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
                           <MenuItem value="authenticated">
                             Authenticated
                           </MenuItem>
-                          {publicMenuItem}
+                          {canSharePortsPublic ? (
+                            <MenuItem value="public">Public</MenuItem>
+                          ) : (
+                            disabledPublicMenuItem
+                          )}
                         </Select>
                       </FormControl>
                       <Button
@@ -512,7 +510,11 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
                     label="Sharing Level"
                   >
                     <MenuItem value="authenticated">Authenticated</MenuItem>
-                    {publicMenuItem}
+                    {canSharePortsPublic ? (
+                      <MenuItem value="public">Public</MenuItem>
+                    ) : (
+                      disabledPublicMenuItem
+                    )}
                   </TextField>
                   <LoadingButton
                     variant="contained"