diff --git a/README.md b/README.md
index 723a3c797..b4896eb36 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ We also believe in [software modularity](https://en.wikipedia.org/wiki/Modular_p
 ## Learning project
 
 AzerothCore is a learning project.
-If you want to learn how to use C++, SQL, git, etc... you came to the right place! We will gladly to help you: **programming is our passion**.
+If you want to learn how to use C++, SQL, git, etc... you came to the right place! We will gladly help you: **programming is our passion**.
 
 If you want to contribute, in [our wiki](https://github.com/azerothcore/azerothcore-wotlk/wiki) you fill find a lot of resources that will guide you. Also you can poke us in [our discord chat server](https://discord.gg/gkt4y2x).
 
diff --git a/src/server/game/Maps/TransportMgr.cpp b/src/server/game/Maps/TransportMgr.cpp
index 4bfae7434..1d0325cb1 100644
--- a/src/server/game/Maps/TransportMgr.cpp
+++ b/src/server/game/Maps/TransportMgr.cpp
@@ -403,52 +403,60 @@ void TransportMgr::SpawnContinentTransports()
     if (_transportTemplates.empty())
         return;
 
-    uint32 oldMSTime = getMSTime();
-    QueryResult result = WorldDatabase.Query("SELECT guid, entry FROM transports");
-    uint32 count = 0;
-    if (result)
-    {
-        do
-        {
-            Field* fields = result->Fetch();
-            uint32 guid = fields[0].GetUInt32();
-            uint32 entry = fields[1].GetUInt32();
-
-            if (TransportTemplate const* tInfo = GetTransportTemplate(entry))
-                if (!tInfo->inInstance)
-                    if (CreateTransport(entry, guid))
-                        ++count;
-
-        } while (result->NextRow());
-    }
-
-    sLog->outString(">> Spawned %u continent motion transports in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
-
-    // pussywizard: preload grids for continent static transports
+    uint32 oldMSTime, count = 0;
     oldMSTime = getMSTime();
-    result = WorldDatabase.Query("SELECT map, position_x, position_y FROM gameobject g JOIN gameobject_template t ON g.id = t.entry WHERE t.type = 11");
-    count = 0;
-    if (result)
+    QueryResult result;
+
+    if (sWorld->getBoolConfig(CONFIG_ENABLE_CONTINENT_TRANSPORT))
     {
-        do
+        result = WorldDatabase.Query("SELECT guid, entry FROM transports");
+        if (result)
         {
-            Field* fields = result->Fetch();
-            uint16 mapId = fields[0].GetUInt16();
-            float x = fields[1].GetFloat();
-            float y = fields[2].GetFloat();
+            do
+            {
+                Field* fields = result->Fetch();
+                uint32 guid = fields[0].GetUInt32();
+                uint32 entry = fields[1].GetUInt32();
 
-            MapEntry const* mapEntry = sMapStore.LookupEntry(mapId);
-            if (mapEntry && !mapEntry->Instanceable())
-                if (Map* map = sMapMgr->CreateBaseMap(mapId))
+                if (TransportTemplate const* tInfo = GetTransportTemplate(entry))
+                    if (!tInfo->inInstance)
+                        if (CreateTransport(entry, guid))
+                            ++count;
+
+            } while (result->NextRow());
+        }
+
+        sLog->outString(">> Spawned %u continent motion transports in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
+
+        if (sWorld->getBoolConfig(CONFIG_ENABLE_CONTINENT_TRANSPORT_PRELOADING))
+        {
+            // pussywizard: preload grids for continent static transports
+            oldMSTime = getMSTime();
+            result = WorldDatabase.Query("SELECT map, position_x, position_y FROM gameobject g JOIN gameobject_template t ON g.id = t.entry WHERE t.type = 11");
+            count = 0;
+            if (result)
+            {
+                do
                 {
-                    map->LoadGrid(x, y);
-                    ++count;
-                }
+                    Field* fields = result->Fetch();
+                    uint16 mapId = fields[0].GetUInt16();
+                    float x = fields[1].GetFloat();
+                    float y = fields[2].GetFloat();
 
-        } while (result->NextRow());
+                    MapEntry const* mapEntry = sMapStore.LookupEntry(mapId);
+                    if (mapEntry && !mapEntry->Instanceable())
+                        if (Map* map = sMapMgr->CreateBaseMap(mapId))
+                        {
+                            map->LoadGrid(x, y);
+                            ++count;
+                        }
+
+                } while (result->NextRow());
+            }
+
+            sLog->outString(">> Preloaded grids for %u continent static transports in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
+        }
     }
-
-    sLog->outString(">> Preloaded grids for %u continent static transports in %u ms", count, GetMSTimeDiffToNow(oldMSTime));
 }
 
 void TransportMgr::CreateInstanceTransports(Map* map)
diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp
index 8be4f1000..dabae8389 100644
--- a/src/server/game/World/World.cpp
+++ b/src/server/game/World/World.cpp
@@ -1300,6 +1300,9 @@ void World::LoadConfigSettings(bool reload)
     m_int_configs[CONFIG_BIRTHDAY_TIME] = sConfigMgr->GetIntDefault("BirthdayTime", 1222964635);
     m_bool_configs[CONFIG_MINIGOB_MANABONK] = sConfigMgr->GetBoolDefault("Minigob.Manabonk.Enable", true);
 
+    m_bool_configs[CONFIG_ENABLE_CONTINENT_TRANSPORT] = sConfigMgr->GetBoolDefault("IsContinentTransport.Enabled", true);
+    m_bool_configs[CONFIG_ENABLE_CONTINENT_TRANSPORT_PRELOADING] = sConfigMgr->GetBoolDefault("IsPreloadedContinentTransport.Enabled", false);
+
     // call ScriptMgr if we're reloading the configuration
     sScriptMgr->OnAfterConfigLoad(reload);
 }
diff --git a/src/server/game/World/World.h b/src/server/game/World/World.h
index d302ec89b..784d5138c 100644
--- a/src/server/game/World/World.h
+++ b/src/server/game/World/World.h
@@ -158,6 +158,8 @@ enum WorldBoolConfigs
     CONFIG_QUEST_IGNORE_AUTO_ACCEPT,
     CONFIG_QUEST_IGNORE_AUTO_COMPLETE,
     CONFIG_WARDEN_ENABLED,
+    CONFIG_ENABLE_CONTINENT_TRANSPORT,
+    CONFIG_ENABLE_CONTINENT_TRANSPORT_PRELOADING,
     BOOL_CONFIG_VALUE_COUNT
 };
 
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index 7c14d0df4..af1ecce02 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -1450,6 +1450,27 @@ AccountInstancesPerHour = 5
 
 BirthdayTime = 1222964635
 
+#
+#   IsContinentTransport.Enabled
+#        Description: Controls the continent transport (ships, zeppelins etc..)
+#        Default:     1 - (Enabled) 
+#
+#
+
+IsContinentTransport.Enabled = 1
+
+#
+#   IsPreloadedContinentTransport.Enabled
+#        Description: Should we preload the transport? 
+#           (Not recommended on low-end servers as it consumes 100% more ram)
+#           and it's not really necessary to be enabled.
+#
+#        Default:     0 - (Disabled) 
+#
+#
+
+IsPreloadedContinentTransport.Enabled = 0
+
 #
 ###################################################################################################