diff --git a/Makefile b/Makefile
index 88ada00ef..3aae36ad0 100644
--- a/Makefile
+++ b/Makefile
@@ -84,10 +84,9 @@ release:
 
 .PHONY: %-shell
 # HELP: launch shell (bash) inside a currently running container
-%-shell: ENTRYPOINT?=/bin/bash
 %-shell: --%-shell;
 --%-shell:
-	$(CONTAINER_COMMAND) exec -it $(EXEC_OPTS) fradrive.$(CURR_DEV).$* $(ENTRYPOINT)
+	$(CONTAINER_COMMAND) exec -it $(EXEC_OPTS) fradrive.$(CURR_DEV).$* $(if $(ENTRYPOINT),$(ENTRYPOINT),/bin/bash)
 
 ##### GENERAL TARGETS #####
 ###########################