diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2_ws.tab
index ab3959768..a7c98a362 100755
--- a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2_ws.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_6_2_ws.tab
@@ -40,7 +40,7 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 1033375	0	object/static/structure/tatooine/pillar_ruined_large_style_01.iff	0	1320.15	5	1629.48	0.858528	0	-0.512767	0		$|
 1033376	0	object/static/structure/tatooine/wall_damaged_tatooine_large_style_01.iff	0	1392.17	3.02175	1643.47	0.786918	0	0.617057	0		$|
 1033377	0	object/static/structure/tatooine/wall_damaged_tatooine_large_style_01.iff	0	1400.04	3.02175	1645.89	-0.620985	0	0.783823	0		$|
-1082874	0	object/building/tatooine/cantina_tatooine.iff	0	1384.35	5	1325.87	0.945266	0	0.326302	0	theme_park.tatooine.mos_eisley.masterspawner	$|
+1082874	0	object/building/tatooine/cantina_tatooine.iff	0	1384.35	5	1325.87	0.945266	0	0.326302	0	theme_park.tatooine.mos_eisley.masterspawner	intSpawnBartender|0|0|$|
 1082875	1082874	object/cell/cell.iff	1	0	0	0	1	0	0	0		$|
 1082876	1082874	object/cell/cell.iff	2	0	0	0	1	0	0	0		$|
 1082877	1082874	object/cell/cell.iff	3	0	0	0	1	0	0	0		$|
diff --git a/sku.0/sys.server/compiled/game/object/building/base/base_cantina.tpf b/sku.0/sys.server/compiled/game/object/building/base/base_cantina.tpf
index 4f610cb57..4d478e50c 100755
--- a/sku.0/sys.server/compiled/game/object/building/base/base_cantina.tpf
+++ b/sku.0/sys.server/compiled/game/object/building/base/base_cantina.tpf
@@ -8,5 +8,5 @@
 
 @class object_template 5
 scripts = +["structure.municipal.cantina"]
-objvars = +["healing.canhealshock"=1]
+objvars = +["healing.canhealshock"=1, "intSpawnBartender"=1]
 moveFlags = [ MF_gm ]
diff --git a/sku.0/sys.server/compiled/game/script/structure/municipal/cantina.java b/sku.0/sys.server/compiled/game/script/structure/municipal/cantina.java
index 65baae65b..b4772abe0 100755
--- a/sku.0/sys.server/compiled/game/script/structure/municipal/cantina.java
+++ b/sku.0/sys.server/compiled/game/script/structure/municipal/cantina.java
@@ -25,18 +25,20 @@ public class cantina extends script.base_script
         {
             return SCRIPT_OVERRIDE;
         }
-        behindBar = new location(8.54f, -0.89f, 0.14f, planet, cantina);
-        obj_id bartender = create.object("bartender", behindBar);
-        setYaw(bartender, 87);
-        // removed static setting as it caused bartenders to just stay put.  They move around the bar
-        // so this caused a memory leak by storing points it couldn't navigate to.
-        // setCreatureStatic(bartender, true);
+        if(getIntObjVar(self,"intSpawnBartender") == 1) {
+            behindBar = new location(8.54f, -0.89f, 0.14f, planet, cantina);
+            obj_id bartender = create.object("bartender", behindBar);
+            setYaw(bartender, 87);
+            // removed static setting as it caused bartenders to just stay put.  They move around the bar
+            // so this caused a memory leak by storing points it couldn't navigate to.
+            // setCreatureStatic(bartender, true);
 
-        setInvulnerable(bartender, true);
-        attachScript(bartender, "npc.bartender.base");
-        attachScript(bartender, "npc.bartender.listen");
-        ai_lib.setDefaultCalmMood(bartender, "npc_imperial");
-        //ai_lib.setDefaultCalmBehavior(self, ai_lib.BEHAVIOR_SENTINEL);
+            setInvulnerable(bartender, true);
+            attachScript(bartender, "npc.bartender.base");
+            attachScript(bartender, "npc.bartender.listen");
+            ai_lib.setDefaultCalmMood(bartender, "npc_imperial");
+            //ai_lib.setDefaultCalmBehavior(self, ai_lib.BEHAVIOR_SENTINEL);
+        }
         if (hasScript(self, "theme_park.lok.cantina"))
         {
             if (hasScript(self, "city.imperial_crackdown.crackdown_cantina"))