diff --git a/src/main/java/org/dynmap/DynmapPlugin.java b/src/main/java/org/dynmap/DynmapPlugin.java
index b44bd127..d9d83529 100644
--- a/src/main/java/org/dynmap/DynmapPlugin.java
+++ b/src/main/java/org/dynmap/DynmapPlugin.java
@@ -1254,7 +1254,9 @@ public class DynmapPlugin extends JavaPlugin {
         }
         return markerapi;
     }
-    
+    public boolean markerAPIInitialized() {
+        return (markerapi != null);
+    }
     /**
      * Register markers API - used by component to supply marker API to plugin
      */
diff --git a/src/main/java/org/dynmap/MarkersComponent.java b/src/main/java/org/dynmap/MarkersComponent.java
index 3077906d..969999f6 100644
--- a/src/main/java/org/dynmap/MarkersComponent.java
+++ b/src/main/java/org/dynmap/MarkersComponent.java
@@ -24,7 +24,10 @@ public class MarkersComponent extends ClientComponent {
         super(plugin, configuration);
         /* Register API with plugin, if needed */
         api = (MarkerAPIImpl)plugin.getMarkerAPI();
-        if(api == null) {
+        if(plugin.markerAPIInitialized()) {
+            api = (MarkerAPIImpl)plugin.getMarkerAPI();
+        }
+        else {
             api = MarkerAPIImpl.initializeMarkerAPI(plugin);
             plugin.registerMarkerAPI(api);
         }