diff --git a/src/autoapp/USB/USBApp.cpp b/src/autoapp/USB/USBApp.cpp
index 58f4cca..7f1af9a 100644
--- a/src/autoapp/USB/USBApp.cpp
+++ b/src/autoapp/USB/USBApp.cpp
@@ -73,6 +73,8 @@ void USBApp::aoapDeviceHandler(aasdk::usb::DeviceHandle deviceHandle)
         catch(const aasdk::error::Error& error)
         {
             OPENAUTO_LOG(error) << "[USBApp] AndroidAutoEntity create error: " << error.what();
+
+            androidAutoEntity_.reset();
             this->waitForDevice();
         }
     }