diff --git a/README.org b/README.org
index 16ce723..7847dc5 100644
--- a/README.org
+++ b/README.org
@@ -119,6 +119,7 @@
      #   <SSH connection string><absolute_path_to_media_directory>
      #
      # Multiple media directories can be set with a comma (,) as delimiter.
+     # Spaces must be escaped with a backslash (\).
      # Media directories are queried and played in order.
      #
      # Examples:
diff --git a/strm b/strm
index 278eb9d..1845db3 100755
--- a/strm
+++ b/strm
@@ -112,11 +112,9 @@ if [ "$media_directories" == "" ]; then
     fi
 fi
 
-# Remove possible whitespace characters from media directories string
-media_directories=${media_directories//[[:blank:]]/}
-
 # Read media directories
 IFS="," read -a media_directories <<< "$media_directories"
+echo "${#media_directories[@]}"
 
 # Construct find argument array
 # Ignore hidden files and directories and list only files and symlinks
@@ -152,7 +150,7 @@ for media_directory in "${media_directories[@]}"; do
 
     # Get search results from remote
     # Look for paths matching given queries in visible directories, listing only filenames and links
-    mapfile -t tmp_results < <(ssh -o ConnectTimeout=10 "$connection_string" find "$directory" "${find_arguments[@]}" | sort)
+    mapfile -t tmp_results < <(ssh -o ConnectTimeout=10 "$connection_string" find "'$directory'" "${find_arguments[@]}" | sort)
 
     # Build SFTP strings and printable strings
     for i in "${!tmp_results[@]}"; do
diff --git a/strm.config b/strm.config
index 0e6ed93..6a40172 100644
--- a/strm.config
+++ b/strm.config
@@ -3,6 +3,7 @@
 #   <SSH connection string><absolute_path_to_media_directory>
 #
 # Multiple media directories can be set with a comma (,) as delimiter.
+# Spaces must be escaped with a backslash (\).
 # Media directories are queried and played in order.
 #
 # Examples: