diff --git a/libraries/controllers/src/controllers/UserInputMapper.cpp b/libraries/controllers/src/controllers/UserInputMapper.cpp
index bd0eeda6bd..79f4325ae6 100755
--- a/libraries/controllers/src/controllers/UserInputMapper.cpp
+++ b/libraries/controllers/src/controllers/UserInputMapper.cpp
@@ -332,7 +332,7 @@ QString UserInputMapper::getActionName(Action action) const {
 QString UserInputMapper::getStandardPoseName(uint16_t pose) {
     Locker locker(_lock);
     for (auto posePair : getStandardInputs()) {
-        if (posePair.first.channel == pose) {
+        if (posePair.first.channel == pose && posePair.first.getType() == ChannelType::POSE) {
             return posePair.second;
         }
     }
diff --git a/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.cpp b/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.cpp
index f1bdae1e0b..ef9f04402b 100644
--- a/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.cpp
+++ b/libraries/controllers/src/controllers/impl/endpoints/ActionEndpoint.cpp
@@ -36,9 +36,6 @@ void ActionEndpoint::apply(const Pose& value, const Pointer& source) {
     auto userInputMapper = DependencyManager::get<UserInputMapper>();
     QString actionName = userInputMapper->getActionName(Action(_input.getChannel()));
     inputRecorder->setActionState(actionName, _currentPose);
-    if (inputRecorder->isPlayingback()) {
-        //_currentPose = inputRecorder->getPoseState(actionName);
-    }
     
     if (!_currentPose.isValid()) {
         return;
diff --git a/libraries/controllers/src/controllers/impl/endpoints/StandardEndpoint.h b/libraries/controllers/src/controllers/impl/endpoints/StandardEndpoint.h
index f6d04b8c86..2006809fed 100644
--- a/libraries/controllers/src/controllers/impl/endpoints/StandardEndpoint.h
+++ b/libraries/controllers/src/controllers/impl/endpoints/StandardEndpoint.h
@@ -49,7 +49,6 @@ public:
         if (inputRecorder->isPlayingback()) {
             auto userInputMapper = DependencyManager::get<UserInputMapper>();
             QString actionName =  userInputMapper->getStandardPoseName(_input.getChannel());
-            qDebug() << actionName;
             return inputRecorder->getPoseState(actionName);
         }
         return VirtualEndpoint::pose();