diff --git a/src/mavsdk/plugins/mission_raw_server/mission_raw_server_impl.cpp b/src/mavsdk/plugins/mission_raw_server/mission_raw_server_impl.cpp
index f4b681f637..8d28761f8c 100644
--- a/src/mavsdk/plugins/mission_raw_server/mission_raw_server_impl.cpp
+++ b/src/mavsdk/plugins/mission_raw_server/mission_raw_server_impl.cpp
@@ -343,7 +343,7 @@ void MissionRawServerImpl::set_current_item_complete()
 
 void MissionRawServerImpl::set_current_seq(std::size_t seq)
 {
-    if (_current_mission.size() < static_cast<size_t>(seq)) {
+    if (_current_mission.size() < static_cast<size_t>(seq) || _current_mission.empty()) {
         return;
     }