diff --git a/src/components/SendMessageWizard/useSendMessageWizard.js b/src/components/SendMessageWizard/useSendMessageWizard.js
index abc137a..b390004 100644
--- a/src/components/SendMessageWizard/useSendMessageWizard.js
+++ b/src/components/SendMessageWizard/useSendMessageWizard.js
@@ -28,7 +28,15 @@ const useSendMessageWizard = () => {
       case 'select':
         return state.selectedContacts.length > 0;
       case 'message':
-        return state.message.trim().length > 0;
+        if (state.message.trim().length > 0) {
+          if (state.createdMessage != null) {
+            return true;
+          } else {
+            return false;
+          }
+        } else {
+          return false;
+        }
       case 'schedule':
         console.log('Checking to see if schedule can go to the next step');
         if (state.scheduledTime == null) {
@@ -49,6 +57,7 @@ const useSendMessageWizard = () => {
     state.step,
     state.selectedContacts.length,
     state.message,
+    state.createdMessage,
     state.scheduledTime,
   ]);