diff --git a/sf-org-info b/sf-org-info
index 19336f3..f97a3a5 100755
--- a/sf-org-info
+++ b/sf-org-info
@@ -109,10 +109,10 @@ show_org_info() {
   echo "======================================="
   
   # Get basic org info
-  if sf org display "${cmd_args[@]}" --json >/dev/null 2>&1; then
+  if sf org display ${cmd_args[@]:+"${cmd_args[@]}"} --json >/dev/null 2>&1; then
     echo
     echo "📊 Basic Information:"
-    sf org display "${cmd_args[@]}" 2>/dev/null || {
+    sf org display ${cmd_args[@]:+"${cmd_args[@]}"} 2>/dev/null || {
       echo "❌ Unable to retrieve org information"
       return 1
     }
@@ -127,8 +127,8 @@ show_org_info() {
     echo
     echo "📈 Org Limits:"
     echo "-------------"
-    if sf org list limits "${cmd_args[@]}" >/dev/null 2>&1; then
-      sf org list limits "${cmd_args[@]}" 2>/dev/null | head -20 || echo "Unable to retrieve org limits"
+    if sf org list limits ${cmd_args[@]:+"${cmd_args[@]}"} >/dev/null 2>&1; then
+      sf org list limits ${cmd_args[@]:+"${cmd_args[@]}"} 2>/dev/null | head -20 || echo "Unable to retrieve org limits"
     else
       echo "Unable to retrieve org limits"
     fi
@@ -136,8 +136,8 @@ show_org_info() {
     echo
     echo "⚙️  Org Shape (if available):"
     echo "-----------------------------"
-    if sf org list shape "${cmd_args[@]}" >/dev/null 2>&1; then
-      sf org list shape "${cmd_args[@]}" 2>/dev/null || echo "No org shapes available"
+    if sf org list shape ${cmd_args[@]:+"${cmd_args[@]}"} >/dev/null 2>&1; then
+      sf org list shape ${cmd_args[@]:+"${cmd_args[@]}"} 2>/dev/null || echo "No org shapes available"
     else
       echo "No org shapes available"
     fi