diff --git a/src/building/animation.c b/src/building/animation.c
index 0766948283..9f1530a818 100644
--- a/src/building/animation.c
+++ b/src/building/animation.c
@@ -102,6 +102,11 @@ int building_animation_offset(building *b, int image_id, int grid_offset)
     if (b->type == BUILDING_ARMOURY && b->num_workers <= 0) {
         return 0;
     }
+
+    if (b->type == BUILDING_AMPHITHEATER && b->num_workers <= 0) {
+        return 0;
+    }
+
     if (b->type == BUILDING_COLOSSEUM) {
         map_image_set(grid_offset, building_image_get(b));
     }
diff --git a/src/widget/city_without_overlay.c b/src/widget/city_without_overlay.c
index 48aa84fb5f..25d4c555ca 100644
--- a/src/widget/city_without_overlay.c
+++ b/src/widget/city_without_overlay.c
@@ -273,9 +273,6 @@ static void draw_hippodrome_spectators(const building *b, int x, int y, color_t
 
 static void draw_entertainment_spectators(building *b, int x, int y, color_t color_mask)
 {
-    if (b->type == BUILDING_AMPHITHEATER && b->num_workers > 0) {
-        image_draw(image_group(GROUP_BUILDING_AMPHITHEATER_SHOW), x + 36, y - 47, color_mask, draw_context.scale);
-    }
     if (b->type == BUILDING_HIPPODROME && building_main(b)->num_workers > 0
         && city_entertainment_hippodrome_has_race()) {
         draw_hippodrome_spectators(b, x, y, color_mask);