diff --git a/flutter/lib/pages/settings/settings_view.dart b/flutter/lib/pages/settings/settings_view.dart
index 7353589..3333c2f 100644
--- a/flutter/lib/pages/settings/settings_view.dart
+++ b/flutter/lib/pages/settings/settings_view.dart
@@ -189,7 +189,7 @@ class _SettingsRootPageState extends State<SettingsRootPage> {
               value: Column(
                 crossAxisAlignment: CrossAxisAlignment.start,
                 children: [
-                  Text(GitStamp.sha.substring(0, 7) + ' +' + Globals().buildNumber),
+                  Text('${GitStamp.sha.substring(0, GitStamp.sha.length.clamp(0, 7))} +${Globals().buildNumber}'),
                   Text("( " + cfg.dateFormat.dateFormat().format(DateTime.parse(GitStamp.buildDateTime).toLocal()) + " )", style: TextStyle(fontStyle: FontStyle.italic)),
                 ],
               ),