diff --git a/bin/spring b/bin/spring
index 7fe232c3aae5996a1d6ca1f69d10e636630f5c5c..e0d140fe0c77275134d19722d66f000574bf429d 100755
--- a/bin/spring
+++ b/bin/spring
@@ -3,7 +3,7 @@
 # This file loads spring without using Bundler, in order to be fast.
 # It gets overwritten when you run the `spring binstub` command.
 
-unless defined?(Spring)
+unless (defined?(Spring) || ENV['ENABLE_SPRING'] != '1') && File.basename($0) != 'spring'
   require 'rubygems'
   require 'bundler'