diff --git a/src/main/java/net/knarcraft/stargate/config/DynmapManager.java b/src/main/java/net/knarcraft/stargate/config/DynmapManager.java
index c6cd645..497ea84 100644
--- a/src/main/java/net/knarcraft/stargate/config/DynmapManager.java
+++ b/src/main/java/net/knarcraft/stargate/config/DynmapManager.java
@@ -30,7 +30,7 @@ public final class DynmapManager {
      * @throws NullPointerException <p>If dynmap has an invalid state</p>
      */
     public static void initialize(DynmapAPI dynmapAPI) throws NullPointerException {
-        if (dynmapAPI == null || dynmapAPI.getMarkerAPI() == null) {
+        if (dynmapAPI == null || !dynmapAPI.markerAPIInitialized() || dynmapAPI.getMarkerAPI() == null) {
             markerSet = null;
             portalIcon = null;
         } else {
diff --git a/src/main/java/net/knarcraft/stargate/config/StargateConfig.java b/src/main/java/net/knarcraft/stargate/config/StargateConfig.java
index 98f2f34..8ad737a 100644
--- a/src/main/java/net/knarcraft/stargate/config/StargateConfig.java
+++ b/src/main/java/net/knarcraft/stargate/config/StargateConfig.java
@@ -106,6 +106,8 @@ public final class StargateConfig {
 
         //Set up vault economy if vault has been loaded
         setupVaultEconomy();
+        
+        //Set up dynmap
         DynmapAPI dynmapAPI = (DynmapAPI) Bukkit.getPluginManager().getPlugin("dynmap");
         if (dynmapAPI != null) {
             try {