diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
index c0096a98f..0b174c3d2 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
@@ -23,12 +23,14 @@ package com.intellectualcrafters.plot.database;
 
 import com.google.common.base.Charsets;
 import com.intellectualcrafters.plot.PlotMain;
+import com.intellectualcrafters.plot.config.Settings;
 import com.intellectualcrafters.plot.generator.WorldGenerator;
 import com.intellectualcrafters.plot.object.PlotHomePosition;
 import com.intellectualcrafters.plot.object.PlotId;
 import com.worldcretornica.plotme.PlayerList;
 import com.worldcretornica.plotme.Plot;
 import com.worldcretornica.plotme.PlotManager;
+
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
@@ -77,7 +79,7 @@ public class PlotMeConverter {
                         new ArrayList<>();
                 // Online Mode
                 final boolean online =
-                        Bukkit.getServer().getOnlineMode();
+                        Bukkit.getServer().getOnlineMode() && Settings.OFFLINE_MODE;
                 // PlotMe Plugin
                 final Plugin plotMePlugin =
                         Bukkit.getPluginManager().getPlugin("PlotMe");
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java
index 0f09d89be..3db89d47a 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java
@@ -70,7 +70,7 @@ public class UUIDHandler {
      *
      * @see org.bukkit.Server#getOnlineMode()
      */
-    private final static boolean online = Bukkit.getServer().getOnlineMode();
+    private final static boolean online = Bukkit.getServer().getOnlineMode() && Settings.OFFLINE_MODE;
 
     /**
      * Map containing names and UUIDs