diff --git a/Makefile b/Makefile
index 46c19d69481..f7faf95e188 100644
--- a/Makefile
+++ b/Makefile
@@ -95,8 +95,20 @@ frontend-build:
 .PHONY: frontend-build-storybook
 frontend-build-storybook:
 	cd frontend && npm run build-storybook
+.PHONY: backend-check-build
+backend-check-build:
+	@if [ ! -f backend/headlamp-server${SERVER_EXE_EXT} ] || ! git diff --quiet HEAD -- backend/; then \
+		echo "Backend changes detected, rebuilding..."; \
+		make backend; \
+	elif ! file backend/headlamp-server${SERVER_EXE_EXT} | grep -q "$(shell uname -m | sed 's/_/-/')"; then \
+		echo "Backend architecture mismatch (expected $(shell uname -m)). Rebuilding"; \
+		make backend;\
+	else \
+		echo "Backend is up to date"; \
+	fi
+
 
-run-backend:
+run-backend: backend-check-build
 	@echo "**** Warning: Running with Helm and dynamic-clusters endpoints enabled. ****"
 
 ifeq ($(UNIXSHELL),true)