diff --git a/src/status_im/data_store/realm/schemas/account/migrations.cljs b/src/status_im/data_store/realm/schemas/account/migrations.cljs
index 176eaa58d2..7ee6c38a60 100644
--- a/src/status_im/data_store/realm/schemas/account/migrations.cljs
+++ b/src/status_im/data_store/realm/schemas/account/migrations.cljs
@@ -93,7 +93,8 @@
           (.objects "message")
           (.filtered (str "content-type = \"command-request\""))
           (.map (fn [message _ _]
-                  (aset message "content-type" "command")))))
+                  (when message
+                    (aset message "content-type" "command"))))))
 
 (defn v15 [old-realm new-realm]
   (log/debug "migrating v15 account database"))
diff --git a/src/status_im/ui/screens/chat/message/message.cljs b/src/status_im/ui/screens/chat/message/message.cljs
index 328ab1781c..be5c688858 100644
--- a/src/status_im/ui/screens/chat/message/message.cljs
+++ b/src/status_im/ui/screens/chat/message/message.cljs
@@ -224,6 +224,12 @@
   [wrapper message
    [message-view message [message-content-command message]]])
 
+;; Todo remove after couple of releases
+(defmethod message-content constants/content-type-command-request
+  [wrapper message]
+  [wrapper message
+   [message-view message [message-content-command message]]])
+
 (defmethod message-content constants/content-type-emoji
   [wrapper message]
   [wrapper message [emoji-message message]])