diff --git a/MotorControl/MotorServer.py b/MotorControl/MotorServer.py
index 8c63c18..bb593c9 100644
--- a/MotorControl/MotorServer.py
+++ b/MotorControl/MotorServer.py
@@ -60,4 +60,10 @@ class MotorServicer(motorService_pb2_grpc.CarControlServicer):
         server.start()
 
 servicer = MotorServicer()
-servicer.start_server()
\ No newline at end of file
+servicer.start_server()
+
+run = True
+while run:
+    inp = input('Please press q to stop the server')
+    if inp == 'q' or inp == 'Q':
+        run = False
\ No newline at end of file