diff --git a/spot_wrapper/spot_dance.py b/spot_wrapper/spot_dance.py
index c52c0800..90ea00e9 100644
--- a/spot_wrapper/spot_dance.py
+++ b/spot_wrapper/spot_dance.py
@@ -19,6 +19,12 @@
 from typing import Tuple, List
 
 
+class CommandTimedOutError(Exception):
+    """Raised when call to command does not return completion state in the stipulated time"""
+
+    pass
+
+
 class SpotDance:
     def __init__(
         self,
@@ -84,6 +90,18 @@ def list_all_moves(self) -> Tuple[bool, str, List[str]]:
                 [],
             )
 
+    def _check_dance_completed(
+        self, status: choreography_sequence_pb2.ChoreographyStatusResponse.Status
+    ) -> bool:
+        """Check the status message to see if dance is onging/completed, return True if dance is completed"""
+        ongoing_states = [
+            choreography_sequence_pb2.ChoreographyStatusResponse.Status.STATUS_PREPPING,
+            choreography_sequence_pb2.ChoreographyStatusResponse.Status.STATUS_DANCING,
+            choreography_sequence_pb2.ChoreographyStatusResponse.Status.STATUS_WAITING_FOR_START_TIME,
+            choreography_sequence_pb2.ChoreographyStatusResponse.Status.STATUS_VALIDATING,
+        ]
+        return status not in ongoing_states
+
     def execute_dance(self, data: str) -> Tuple[bool, str]:
         """Upload and execute dance"""
         if self._robot.is_estopped():
@@ -114,19 +132,47 @@ def execute_dance(self, data: str) -> Tuple[bool, str]:
             routine_name = choreography.name
             client_start_time = time.time()
             start_slice = 0  # start the choreography at the beginning
-
-            self._choreography_client.execute_choreography(
+            response = self._choreography_client.execute_choreography(
                 choreography_name=routine_name,
                 client_start_time=client_start_time,
                 choreography_starting_slice=start_slice,
             )
+            if (
+                response.status
+                != choreography_sequence_pb2.ExecuteChoreographyResponse.Status.STATUS_OK
+            ):
+                return (
+                    False,
+                    f"Issue calling execute_choreography, got response.status: {response.status}",
+                )
             total_choreography_slices = 0
             for move in choreography.moves:
                 total_choreography_slices += move.requested_slices
                 estimated_time_seconds = (
                     total_choreography_slices / choreography.slices_per_minute * 60.0
                 )
-            time.sleep(estimated_time_seconds)
-            return True, "success"
+
+            start = time.time()
+            while time.time() - start < estimated_time_seconds + 0.2:
+                choreo_status = self._choreography_client.get_choreography_status()[0]
+                status = choreo_status.status
+                if self._check_dance_completed(status):
+                    if (
+                        status
+                        == choreography_sequence_pb2.ChoreographyStatusResponse.Status.STATUS_COMPLETED_SEQUENCE
+                    ):
+                        return True, "success"
+                    else:
+                        return (
+                            False,
+                            f"call to execute_choreography returned unsuccessful status: {status}",
+                        )
+                time.sleep(0.2)
+            raise CommandTimedOutError(
+                "Call to execute_choreography did not return completion state in stipulated time"
+            )
+
+        except CommandTimedOutError:
+            raise
         except Exception as e:
             return False, f"Error executing dance: {e}"