diff --git a/Budfile b/Budfile
index cbd644d..8515307 100755
--- a/Budfile
+++ b/Budfile
@@ -81,9 +81,15 @@ check_versions() {
 
 docker_push() {
   local version=$(node -p "require('./package.json').version")
-  docker tag habittrove dohsimpson/habittrove:latest
-  docker tag habittrove "dohsimpson/habittrove:v$version"
-  docker push dohsimpson/habittrove:latest
-  docker push "dohsimpson/habittrove:v$version"
-  echo "Pushed Docker images with tags: latest and v$version"
+  # check if version already exist on dockerhub, if so, don't tag and push versioned image
+  if docker pull "dohsimpson/habittrove:v$version" &>/dev/null; then
+    echo "Docker image with tag v$version already exists on DockerHub. Skipping versioned image push"
+    docker tag habittrove dohsimpson/habittrove:latest
+    docker push dohsimpson/habittrove:latest
+    echo "Pushed Docker images with tags: latest"
+  else
+    docker tag habittrove "dohsimpson/habittrove:v$version"
+    docker push "dohsimpson/habittrove:v$version"
+    echo "Pushed Docker images with tags: v$version"
+  fi
 }
diff --git a/components/HabitStreak.tsx b/components/HabitStreak.tsx
index 2be7076..94483f2 100644
--- a/components/HabitStreak.tsx
+++ b/components/HabitStreak.tsx
@@ -11,9 +11,9 @@ interface HabitStreakProps {
 }
 
 export default function HabitStreak({ habits }: HabitStreakProps) {
+  const { settings } = useSettings()
   // Get the last 30 days of data
   const dates = Array.from({ length: 30 }, (_, i) => {
-    const { settings } = useSettings()
     const d = getDateInTimezone(new Date(), settings.system.timezone)
     d.setDate(d.getDate() - i)
     return d.toISOString().split('T')[0]