diff --git a/src/Controller.cpp b/src/Controller.cpp
index bcba3e151aed27bc3e6b4d0f320d75ced47770d6..4345f7940853d5671a99a8f5b338f7b4662bdf27 100644
--- a/src/Controller.cpp
+++ b/src/Controller.cpp
@@ -235,8 +235,12 @@ void Controller::compute_state_status()
                 }
                 else
                 {
-                    set_state(m_acquisition->get_state());
-                    set_status(m_acquisition->get_status());
+					Tango::DevState state = m_acquisition->get_state();
+                    set_state(state);
+					if(state == Tango::STANDBY)
+						set_status("Waiting for request ...");
+					else
+						set_status(m_acquisition->get_status());
                 }
             }
             else if(m_state == Tango::OFF)