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 1130fa27a..9b328ab08 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/util/UUIDHandler.java
@@ -315,15 +315,24 @@ public class UUIDHandler {
         return uuidWrapper.getUUID(player);
     }
     
+    /**
+     * Safely provide the correct UUID provider. Ignores user preference if not possible rather than break the plugin.
+     */
     public static UUID getUUID(OfflinePlayer player) {
         if (uuidWrapper == null) {
-            try {
-                getUUID(player);
-                uuidWrapper = new DefaultUUIDWrapper();
-            }
-            catch (Throwable e) {
+            
+            if (Settings.OFFLINE_MODE) {
                 uuidWrapper = new OfflineUUIDWrapper();
             }
+            else {
+                try {
+                    getUUID(player);
+                    uuidWrapper = new DefaultUUIDWrapper();
+                }
+                catch (Throwable e) {
+                    uuidWrapper = new OfflineUUIDWrapper();
+                }
+            }
         }
         try {
             return uuidWrapper.getUUID(player);