diff --git a/src/ebusd/bushandler.cpp b/src/ebusd/bushandler.cpp
index 45c664f2..43b54070 100755
--- a/src/ebusd/bushandler.cpp
+++ b/src/ebusd/bushandler.cpp
@@ -897,7 +897,7 @@ result_t BusHandler::handleSymbol() {
         return setState(bs_skip, RESULT_ERR_INVALID_ARG);
       }
       istringstream input;  // TODO create input from database of internal variables
-      if (message == m_messages->getScanMessage()) {
+      if (message == m_messages->getScanMessage() || message == m_messages->getScanMessage(m_ownSlaveAddress)) {
         input.str(SCAN_ANSWER);
       }
       // build response and store in m_response for sending back to requesting master