diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index 79d4914b717fc5e27ba8e04753bf4ccf2f8ff52b..01214254d1e5d36beb9645dc030d92c78ee45e36 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -1100,6 +1100,8 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
             imageWidth = p.width;
             imageHeight = p.height;
             imageStart = QGC::groundTimeMilliseconds();
+            imagePacketsArrived = 0;
+
         }
             break;
 
@@ -1132,7 +1134,6 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
             if ((imagePacketsArrived >= imagePackets))
             {
                 // Restart statemachine
-                imagePacketsArrived = 0;
                 emit imageReady(this);
                 //qDebug() << "imageReady emitted. all packets arrived";
             }