diff --git a/libraries/AP_Scripting/AP_Scripting.cpp b/libraries/AP_Scripting/AP_Scripting.cpp
index f6c3d33605..a2a2b88194 100644
--- a/libraries/AP_Scripting/AP_Scripting.cpp
+++ b/libraries/AP_Scripting/AP_Scripting.cpp
@@ -274,6 +274,10 @@ void AP_Scripting::handle_mission_command(const AP_Mission::Mission_Command& cmd
     if (mission_data == nullptr) {
         // load buffer
         mission_data = new ObjectBuffer<struct AP_Scripting::scripting_mission_cmd>(mission_cmd_queue_size);
+        if (mission_data != nullptr && mission_data->get_size() == 0) {
+            delete mission_data;
+            mission_data = nullptr;
+        }
         if (mission_data == nullptr) {
             gcs().send_text(MAV_SEVERITY_INFO, "Scripting: %s", "unable to receive mission command");
             return;