diff --git a/src/short-urls/CreateShortUrl.tsx b/src/short-urls/CreateShortUrl.tsx
index 13a44654..cc97427f 100644
--- a/src/short-urls/CreateShortUrl.tsx
+++ b/src/short-urls/CreateShortUrl.tsx
@@ -43,19 +43,20 @@ const CreateShortUrl = (ShortUrlForm: FC<ShortUrlFormProps>, CreateShortUrlResul
   const initialState = useMemo(() => getInitialState(shortUrlCreationSettings), [ shortUrlCreationSettings ]);
 
   return (
-    <ShortUrlForm
-      initialState={initialState}
-      saving={shortUrlCreationResult.saving}
-      selectedServer={selectedServer}
-      mode={basicMode ? 'create-basic' : 'create'}
-      onSave={createShortUrl}
-    >
+    <>
+      <ShortUrlForm
+        initialState={initialState}
+        saving={shortUrlCreationResult.saving}
+        selectedServer={selectedServer}
+        mode={basicMode ? 'create-basic' : 'create'}
+        onSave={createShortUrl}
+      />
       <CreateShortUrlResult
         {...shortUrlCreationResult}
         resetCreateShortUrl={resetCreateShortUrl}
         canBeClosed={basicMode}
       />
-    </ShortUrlForm>
+    </>
   );
 };
 
diff --git a/src/short-urls/EditShortUrl.tsx b/src/short-urls/EditShortUrl.tsx
index 5d2078bf..4d83a81e 100644
--- a/src/short-urls/EditShortUrl.tsx
+++ b/src/short-urls/EditShortUrl.tsx
@@ -71,18 +71,19 @@ export const EditShortUrl = (ShortUrlForm: FC<ShortUrlFormProps>) => ({
   }
 
   return (
-    <ShortUrlForm
-      initialState={getInitialState(shortUrl, shortUrlCreationSettings)}
-      saving={saving}
-      selectedServer={selectedServer}
-      mode="edit"
-      onSave={async (shortUrlData) => shortUrl && editShortUrl(shortUrl.shortCode, shortUrl.domain, shortUrlData)}
-    >
+    <>
+      <ShortUrlForm
+        initialState={getInitialState(shortUrl, shortUrlCreationSettings)}
+        saving={saving}
+        selectedServer={selectedServer}
+        mode="edit"
+        onSave={async (shortUrlData) => shortUrl && editShortUrl(shortUrl.shortCode, shortUrl.domain, shortUrlData)}
+      />
       {savingError && (
         <Result type="error" className="mt-3">
           <ShlinkApiError errorData={savingErrorData} fallbackMessage="An error occurred while updating short URL :(" />
         </Result>
       )}
-    </ShortUrlForm>
+    </>
   );
 };
diff --git a/src/short-urls/ShortUrlForm.tsx b/src/short-urls/ShortUrlForm.tsx
index 914f6d7b..1d51e91f 100644
--- a/src/short-urls/ShortUrlForm.tsx
+++ b/src/short-urls/ShortUrlForm.tsx
@@ -39,7 +39,7 @@ export const ShortUrlForm = (
   TagsSelector: FC<TagsSelectorProps>,
   ForServerVersion: FC<Versions>,
   DomainSelector: FC<DomainSelectorProps>,
-): FC<ShortUrlFormProps> => ({ mode, saving, onSave, initialState, selectedServer, children }) => { // eslint-disable-line complexity
+): FC<ShortUrlFormProps> => ({ mode, saving, onSave, initialState, selectedServer }) => { // eslint-disable-line complexity
   const [ shortUrlData, setShortUrlData ] = useState(initialState);
   const isEdit = mode === 'edit';
   const changeTags = (tags: string[]) => setShortUrlData({ ...shortUrlData, tags: tags.map(normalizeTag) });
@@ -201,8 +201,6 @@ export const ShortUrlForm = (
           {saving ? 'Saving...' : 'Save'}
         </Button>
       </div>
-
-      {children}
     </form>
   );
 };