diff --git a/plugins/20_events/hook b/plugins/20_events/hook
index 4688dd8bc..0f21da9fb 100755
--- a/plugins/20_events/hook
+++ b/plugins/20_events/hook
@@ -2,4 +2,4 @@
 set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
 source "$(dirname $0)/../common/functions"
 
-[[ ! "$DOKKU_EVENTS" ]] || dokku_log_pluginhook_call "$(basename $0)" $@
+[[ ! "$DOKKU_EVENTS" ]] || dokku_log_pluginhook_call "$(basename $0)" "$@"
diff --git a/plugins/common/functions b/plugins/common/functions
index 2752dfc1d..c7afd2bc1 100755
--- a/plugins/common/functions
+++ b/plugins/common/functions
@@ -91,7 +91,7 @@ dokku_log_fail() {
 }
 
 dokku_log_event() {
-  logger -t dokku -i -- $@
+  logger -t dokku -i -- "$@"
 }
 
 dokku_log_pluginhook_call() {