diff --git a/src/ui/uas/UASQuickView.cc b/src/ui/uas/UASQuickView.cc
index 5ec115f17f8f9826f6dbcf2224849b38f591867e..b52ab4a71d23f6f9146524fcb28533c6f3d689c8 100644
--- a/src/ui/uas/UASQuickView.cc
+++ b/src/ui/uas/UASQuickView.cc
@@ -248,11 +248,11 @@ void UASQuickView::updateTimerTick()
 
 void UASQuickView::_activeVehicleChanged(Vehicle* vehicle)
 {
-    if (uas) {
+    if (uas || !vehicle) {
         return;
     }
     this->uas = vehicle->uas();
-    connect(uas,SIGNAL(valueChanged(int,QString,QString,QVariant,quint64)),this,SLOT(valueChanged(int,QString,QString,QVariant,quint64)));
+    connect(uas, SIGNAL(valueChanged(int,QString,QString,QVariant,quint64)),this,SLOT(valueChanged(int,QString,QString,QVariant,quint64)));
 }
 void UASQuickView::addSource(MAVLinkDecoder *decoder)
 {