diff --git a/bin/dev b/bin/dev
index 5b780ed3f..b16192883 100755
--- a/bin/dev
+++ b/bin/dev
@@ -3,4 +3,4 @@
 echo "Starting Fizzy on http://localhost:3006"
 echo "Login with david@37signals.com using secret123456"
 
-exec ./bin/rails server -p 3006
+SOLID_QUEUE_IN_PUMA=true exec ./bin/rails server -p 3006
diff --git a/config/puma.rb b/config/puma.rb
index 7a484447a..774848880 100644
--- a/config/puma.rb
+++ b/config/puma.rb
@@ -21,4 +21,4 @@ pidfile ENV.fetch("PIDFILE", "tmp/pids/server.pid")
 plugin :tmp_restart
 
 # Run Solid Queue with Puma
-plugin :solid_queue
+plugin :solid_queue if ENV["SOLID_QUEUE_IN_PUMA"]