diff --git a/app/src/molecules/Command/hooks/useCommandTextString/index.tsx b/app/src/molecules/Command/hooks/useCommandTextString/index.tsx
index 34df2f33c7f..aff19e8a513 100644
--- a/app/src/molecules/Command/hooks/useCommandTextString/index.tsx
+++ b/app/src/molecules/Command/hooks/useCommandTextString/index.tsx
@@ -32,7 +32,11 @@ export function useCommandTextString(
 
   const fullParams = { ...params, t }
 
-  switch (command?.commandType) {
+  if (command == null) {
+    return { commandText: '' }
+  }
+
+  switch (command.commandType) {
     case 'touchTip':
     case 'home':
     case 'savePosition':