diff --git a/osync.sh b/osync.sh
index 632e487..a139f66 100755
--- a/osync.sh
+++ b/osync.sh
@@ -1980,9 +1980,9 @@ function SyncOnChanges
 	do
 		if [ "$ConfigFile" != "" ]
 		then
-        		cmd="bash $osync_cmd \"$ConfigFile\" $opts --no-locks"
+			cmd="bash $osync_cmd \"$ConfigFile\" $opts"
 		else
-			cmd="bash $osync_cmd $opts --no-locks"
+			cmd="bash $osync_cmd $opts"
 		fi
 		eval $cmd
 		retval=$?
@@ -2096,6 +2096,7 @@ do
 		;;
 		--on-changes)
 		sync_on_changes=1
+		nolocks=1
 		;;
 		--no-locks)
 		nolocks=1