diff --git a/applications/player/src/main.cpp b/applications/player/src/main.cpp
index e856a848994603378342853c263450f8ffbcc9e1..cc0f5039a702f64af43004fc8895d447cf8f5a28 100644
--- a/applications/player/src/main.cpp
+++ b/applications/player/src/main.cpp
@@ -93,13 +93,13 @@ int main(int argc, char **argv) {
 					cv::putText(frame, std::string("Time: ") + std::to_string(time) + std::string("s"), cv::Point(10,20), cv::FONT_HERSHEY_PLAIN, 1, cv::Scalar(0,0,255));
 					cv::imshow("Player", frame);
 				}
-				int key = cv::waitKey(20);
+				int key = cv::waitKey(1);
 				if (key >= 48 && key <= 57) {
 					current_stream = key - 48;
 				} else if (key == 'd') {
 					current_channel = (current_channel == 0) ? 1 : 0;
 				} else if (key == 27) {
-					r.end();
+					ftl::timer::stop(false);
 				}
 			}
 		});