diff --git a/Project.toml b/Project.toml
index dc71b8e..c8651e1 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "SearchLight"
 uuid = "340e8cb6-72eb-11e8-37ce-c97ebeb32050"
 authors = ["Adrian Salceanu <e@essenciary.com>"]
-version = "2.1"
+version = "2.1.1"
 
 [deps]
 DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
diff --git a/src/Configuration.jl b/src/Configuration.jl
index d404190..9d48894 100644
--- a/src/Configuration.jl
+++ b/src/Configuration.jl
@@ -54,7 +54,7 @@ function read_db_connection_data(db_settings_file::String) :: Dict{String,Any}
 
   if  haskey(db_conn_data, "env") && db_conn_data["env"] !== nothing
     ENV["SEARCHLIGHT_ENV"] =  if strip(uppercase(string(db_conn_data["env"]))) == """ENV["GENIE_ENV"]"""
-                                ENV["GENIE_ENV"]
+                                haskey(ENV, "GENIE_ENV") ? ENV["GENIE_ENV"] : DEV
                               else
                                 db_conn_data["env"]
                               end