External Hard Disk Doesn't Eject On El Capitan

Ever since upgrading to El Capitan all external hard disks won't eject because Spotlight is always running. I have to stop Spotlight with this command before ejecting or risk corrupting the hard disk:

sudo launchctl unload -w /System/Library/LaunchDaemons/com.apple.metadata.mds.plist

And then restart Spotlight:

sudo launchctl load -w /System/Library/LaunchDaemons/com.apple.metadata.mds.plist