diff --git a/plugins/fancydialogs/VERSION b/plugins/fancydialogs/VERSION
index e484aaf2..927734f1 100644
--- a/plugins/fancydialogs/VERSION
+++ b/plugins/fancydialogs/VERSION
@@ -1 +1 @@
-0.0.16
\ No newline at end of file
+0.0.17
\ No newline at end of file
diff --git a/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/FancyDialogsPlugin.java b/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/FancyDialogsPlugin.java
index 7930ed34..a8c56a68 100644
--- a/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/FancyDialogsPlugin.java
+++ b/plugins/fancydialogs/src/main/java/com/fancyinnovations/fancydialogs/FancyDialogsPlugin.java
@@ -40,6 +40,7 @@ import de.oliver.fancysitula.api.IFancySitula;
 import de.oliver.fancysitula.api.utils.ServerVersion;
 import org.apache.maven.artifact.versioning.ComparableVersion;
 import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 import org.bukkit.plugin.java.JavaPlugin;
 import revxrsal.commands.Lamp;
 import revxrsal.commands.bukkit.BukkitLamp;
@@ -201,6 +202,14 @@ public class FancyDialogsPlugin extends JavaPlugin implements FancyDialogs {
     @Override
     public void onDisable() {
         for (Dialog dialog : dialogRegistry.getAll()) {
+            // Close all viewers of the dialog
+            for (UUID viewer : dialog.getViewers()) {
+                Player player = Bukkit.getPlayer(viewer);
+                if (player != null && player.isOnline()) {
+                    dialog.close(player);
+                }
+            }
+
             dialogStorage.save(dialog.getData());
         }