diff --git a/Drone/client.py b/Drone/client.py
index c17d1c8..d2c6606 100644
--- a/Drone/client.py
+++ b/Drone/client.py
@@ -125,6 +125,7 @@ def animation_player(running_event, stop_event):
     for frame in frames:
         running_event.wait()
         if stop_event.is_set():
+            running_animation_event.clear()
             break
 
         play_animation.animate_frame(frame)
@@ -141,7 +142,6 @@ running_animation_event = threading.Event()
 
 def start_animation(*args, **kwargs):
     animation_thread = threading.Thread(target=animation_player, args=(running_animation_event, stop_animation_event))
-    play_animation.read_animation_file(animation_file)
     print("Starting animation!")
     running_animation_event.set()
     stop_animation_event.clear()
@@ -160,7 +160,6 @@ def pause_animation():
 
 def stop_animation():
     stop_animation_event.set()
-    running_animation_event.clear()
     print("Stopping animation")
 #    animation_thread.join()
 
@@ -231,6 +230,7 @@ try:
                     FlightLib.land1()  # TODO dont forget change back to land
                 elif command == 'disarm':
                     FlightLib.arming(False)
+
                 elif command == 'request':
                     request_target = args[0]
                     print("Got request for:", request_target)