diff --git a/app/components/floating_text_input_label/index.tsx b/app/components/floating_text_input_label/index.tsx
index 3c5e7ade9c..98d0e38fd2 100644
--- a/app/components/floating_text_input_label/index.tsx
+++ b/app/components/floating_text_input_label/index.tsx
@@ -19,11 +19,14 @@ const BORDER_FOCUSED_WIDTH = 2;
 
 const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
     container: {
-        height: DEFAULT_INPUT_HEIGHT + (2 * BORDER_DEFAULT_WIDTH),
         width: '100%',
     },
     errorContainer: {
         flexDirection: 'row',
+
+        // Hack to properly place text in flexbox
+        borderColor: 'transparent',
+        borderWidth: 1,
     },
     errorIcon: {
         color: theme.errorTextColor,
@@ -174,13 +177,8 @@ const FloatingTextInput = forwardRef<FloatingTextInputRef, FloatingTextInputProp
     const onPressAction = !isKeyboardInput && editable && onPress ? onPress : undefined;
 
     const combinedContainerStyle = useMemo(() => {
-        const res: StyleProp<ViewStyle> = [styles.container];
-        if (multiline) {
-            res.push({height: 100 + (2 * BORDER_DEFAULT_WIDTH)});
-        }
-        res.push(containerStyle);
-        return res;
-    }, [styles, containerStyle, multiline]);
+        return [styles.container, containerStyle];
+    }, [styles, containerStyle]);
 
     const combinedTextInputContainerStyle = useMemo(() => {
         const res: StyleProp<TextStyle> = [styles.textInput];
diff --git a/app/screens/server/form.tsx b/app/screens/server/form.tsx
index 28b1865c61..0a4ce39d28 100644
--- a/app/screens/server/form.tsx
+++ b/app/screens/server/form.tsx
@@ -47,9 +47,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
     fullWidth: {
         width: '100%',
     },
-    error: {
-        marginBottom: 18,
-    },
     chooseText: {
         alignSelf: 'flex-start',
         color: changeOpacity(theme.centerChannelColor, 0.64),
@@ -166,7 +163,7 @@ const ServerForm = ({
 
     return (
         <View style={styles.formContainer}>
-            <View style={[styles.fullWidth, urlError?.length ? styles.error : undefined]}>
+            <View style={styles.fullWidth}>
                 <FloatingTextInput
                     autoCorrect={false}
                     autoCapitalize={'none'}
@@ -193,7 +190,7 @@ const ServerForm = ({
                     value={url}
                 />
             </View>
-            <View style={[styles.fullWidth, displayNameError?.length ? styles.error : undefined]}>
+            <View style={styles.fullWidth}>
                 <FloatingTextInput
                     autoCorrect={false}
                     autoCapitalize={'none'}
diff --git a/app/screens/server/index.tsx b/app/screens/server/index.tsx
index 047dc79b3c..48bbfa33b5 100644
--- a/app/screens/server/index.tsx
+++ b/app/screens/server/index.tsx
@@ -317,7 +317,16 @@ const Server = ({
             return;
         }
 
-        const server = await getServerByIdentifier(data.config!.DiagnosticId);
+        if (!data.config?.DiagnosticId) {
+            setUrlError(formatMessage({
+                id: 'mobile.diagnostic_id.empty',
+                defaultMessage: 'A DiagnosticId value is missing for this server. Contact your system admin to review this value and restart the server.',
+            }));
+            setConnecting(false);
+            return;
+        }
+
+        const server = await getServerByIdentifier(data.config.DiagnosticId);
         setConnecting(false);
 
         if (server && server.lastActiveAt > 0) {
diff --git a/assets/base/i18n/en.json b/assets/base/i18n/en.json
index 48dbee5e1d..f237a2b9bc 100644
--- a/assets/base/i18n/en.json
+++ b/assets/base/i18n/en.json
@@ -504,6 +504,7 @@
   "mobile.custom_status.clear_after": "Clear After",
   "mobile.custom_status.clear_after.title": "Clear Custom Status After",
   "mobile.custom_status.modal_confirm": "Done",
+  "mobile.diagnostic_id.empty": "A DiagnosticId value is missing for this server. Contact your system admin to review this value and restart the server.",
   "mobile.direct_message.error": "We couldn't open a DM with {displayName}.",
   "mobile.display_settings.clockDisplay": "Clock Display",
   "mobile.display_settings.crt": "Collapsed Reply Threads",