diff --git a/src/components/salmonrun/ExpandedSalmonRunRow.vue b/src/components/salmonrun/ExpandedSalmonRunRow.vue
index 75d5af9..f7881ed 100644
--- a/src/components/salmonrun/ExpandedSalmonRunRow.vue
+++ b/src/components/salmonrun/ExpandedSalmonRunRow.vue
@@ -8,7 +8,13 @@
       </div>
 
       <div class="hidden ss:block text-shadow text-white text-xl">
-        {{ $t('time.remaining', { time: formatDurationHoursFromNow(schedule.endTime) }) }}
+        <template v-if="time.isUpcoming(schedule.startTime)">
+          Shift opens
+          {{ $t('time.in', { time: formatDurationHoursFromNow(schedule.startTime, true) }) }}
+        </template>
+        <template v-else>
+          {{ $t('time.remaining', { time: formatDurationHoursFromNow(schedule.endTime) }) }}
+        </template>
       </div>
 
       <div
@@ -44,10 +50,13 @@
 
 <script setup>
 import { formatDurationFromNow, formatDurationHoursFromNow } from '@/common/time';
+import { useTimeStore } from '../../stores/time.mjs';
 import StageImage from '../StageImage.vue';
 import SalmonRunWeapons from './SalmonRunWeapons.vue';
 
 defineProps({
   schedule: Object,
 });
+
+const time = useTimeStore();
 </script>
diff --git a/src/components/salmonrun/SalmonRunBox.vue b/src/components/salmonrun/SalmonRunBox.vue
index 8562804..5992c61 100644
--- a/src/components/salmonrun/SalmonRunBox.vue
+++ b/src/components/salmonrun/SalmonRunBox.vue
@@ -11,22 +11,23 @@
 
         <!-- Main content -->
         <div class="md:w-2/3 mx-2 pb-2">
-          <div class="mb-6 space-y-2" v-if="store.activeSchedule">
+          <div class="mb-6 space-y-2" v-if="activeSchedule">
             <SquidTape class="font-splatoon2 text-sm drop-shadow -rotate-6 -mx-2">
               <div class="px-2">{{ $t('times.now') }}</div>
             </SquidTape>
 
-            <ExpandedSalmonRunRow :schedule="store.activeSchedule" />
+            <ExpandedSalmonRunRow :schedule="activeSchedule" />
           </div>
 
-          <div class="ss:hidden py-1 bg-zinc-900 bg-opacity-70 rounded-lg backdrop-blur-sm">
+          <div class="py-1 bg-zinc-900 bg-opacity-70 rounded-lg backdrop-blur-sm" v-if="upcomingSchedules.length">
             <SquidTape class="font-splatoon2 text-sm drop-shadow -rotate-6 -mx-2">
               <div class="px-2">{{ $t('times.future') }}</div>
             </SquidTape>
 
             <div class="mx-2 divide-y-2 divide-dashed divide-zinc-400">
-              <div v-for="schedule in store.upcomingSchedules" :key="schedule.startTime">
-                <SalmonRunRow class="my-2" :schedule="schedule"/>
+              <div v-for="schedule in upcomingSchedules" :key="schedule.startTime">
+                <ExpandedSalmonRunRow class="my-3" :schedule="schedule" v-if="isScreenshot" />
+                <SalmonRunRow class="my-2" :schedule="schedule" v-else />
               </div>
             </div>
           </div>
@@ -37,13 +38,31 @@
 </template>
 
 <script setup>
+import { computed } from 'vue';
 import { useSalmonRunSchedulesStore } from '@/stores/schedules.mjs';
 import ProductContainer from '../ProductContainer.vue';
 import SquidTape from '../SquidTape.vue';
 import SalmonRunRow from './SalmonRunRow.vue';
 import ExpandedSalmonRunRow from './ExpandedSalmonRunRow.vue';
 
+const props = defineProps({
+  isScreenshot: Boolean,
+  startTime: String,
+});
+
 const store = useSalmonRunSchedulesStore();
+
+function filterSchedules(schedules) {
+  return schedules.filter(s => !props.startTime || s?.startTime === props.startTime);
+}
+const activeSchedule = computed(() => filterSchedules([store.activeSchedule])[0]);
+const upcomingSchedules = computed(() => {
+  if (props.isScreenshot && !props.startTime) {
+    return [];
+  }
+
+  return filterSchedules(store.upcomingSchedules);
+});
 </script>
 
 <style scoped>
diff --git a/src/views/screenshots/SalmonRunView.vue b/src/views/screenshots/SalmonRunView.vue
index 9d86ff7..13ef969 100644
--- a/src/views/screenshots/SalmonRunView.vue
+++ b/src/views/screenshots/SalmonRunView.vue
@@ -2,19 +2,16 @@
   <ScreenshotLayout header="Salmon Run">
     <div class="grow flex items-center justify-center">
       <div class="max-w-2xl scale-[1.6]">
-        <SalmonRunBox class="-rotate-1" />
+        <SalmonRunBox class="-rotate-1" is-screenshot :startTime="route.query.startTime" />
       </div>
     </div>
   </ScreenshotLayout>
 </template>
 
 <script setup>
+import { useRoute } from 'vue-router';
 import ScreenshotLayout from '../../layouts/ScreenshotLayout.vue';
-import DailyDropGear from '@/components/screenshots/DailyDropGear.vue';
-import { useGearStore } from '../../stores/gear.mjs';
-import { computed } from 'vue';
 import SalmonRunBox from '../../components/salmonrun/SalmonRunBox.vue';
 
-const gearStore = useGearStore();
-const brand = computed(() => gearStore.dailyDropBrand);
+const route = useRoute();
 </script>