diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
index 9e75b9eda..7be1dfd13 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/BukkitMain.java
@@ -326,7 +326,7 @@ public class BukkitMain extends JavaPlugin implements Listener, IPlotMain {
         } else {
             AbstractTitle.TITLE_CLASS = new DefaultTitle();
         }
-        if (Settings.OFFLINE_MODE) {
+        if (Settings.OFFLINE_MODE || Bukkit.getOnlineMode() == false) {
             UUIDHandler.uuidWrapper = new OfflineUUIDWrapper();
             Settings.OFFLINE_MODE = true;
         } else if (checkVersion) {