diff --git a/containers/apps/freeradius/entrypoint.sh b/containers/apps/freeradius/entrypoint.sh
index a41f263e1a7..990a191ed70 100755
--- a/containers/apps/freeradius/entrypoint.sh
+++ b/containers/apps/freeradius/entrypoint.sh
@@ -10,5 +10,24 @@ fi
 
 chown -R freerad:freerad /config
 
+# this if will check if the first argument is a flag
+# but only works if all arguments require a hyphenated flag
+# -v; -SL; -f arg; etc will work, but not arg1 arg2
+if [ "$#" -eq 0 ] || [ "${1#-}" != "$1" ]; then
+    set -- freeradius -d /config "$@"
+fi
 
-exec freeradius -f -d /config "$@"
+# check for the expected command
+if [ "$1" = 'freeradius' ]; then
+    shift
+    exec freeradius -f -d /config  "$@"
+fi
+
+# many people are likely to call "radiusd" as well, so allow that
+if [ "$1" = 'radiusd' ]; then
+    shift
+    exec freeradius -f -d /config  "$@"
+fi
+
+# else default to run whatever the user wanted like "bash" or "sh"
+exec "$@"