diff --git a/Makefile b/Makefile
index d98fd34e1..843aa334b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DOCKER-RUN = docker-compose run -e TERM --rm --entrypoint=""
+DOCKER-RUN = docker-compose run -e TERM -e DISABLE_SPRING_WATCHER_LISTEN=1 --rm --entrypoint=""
 BUNDLE-EXEC = bundle exec
 
 build:
@@ -18,7 +18,7 @@ sh:
 	$(DOCKER-RUN) web $(BUNDLE-EXEC) bash
 
 guard:
-	$(DOCKER-RUN) web $(BUNDLE-EXEC) guard
+	$(DOCKER-RUN) web $(BUNDLE-EXEC) guard -p
 
 lint:
 	$(DOCKER-RUN) web $(BUNDLE-EXEC) rubocop