diff --git a/scripts/server/native.js b/scripts/server/native.js
index 6609bb6e..61c0a245 100644
--- a/scripts/server/native.js
+++ b/scripts/server/native.js
@@ -105,7 +105,11 @@ function getPlayerVirtualWorld(client) {
 // ---------------------------------------------------------------------------
 
 function getPlayerInterior(client) {
-    return client.player.interior;
+    if(getPlayerData(client)) {
+        if(getPlayerCurrentSubAccount(client)) {
+            return getPlayerCurrentSubAccount(client).interior;
+        }
+    }
 }
 
 // ---------------------------------------------------------------------------
@@ -118,6 +122,7 @@ function setPlayerVirtualWorld(client, dimension) {
 
 function setPlayerInterior(client, interior) {
     triggerNetworkEvent("ag.interior", client, interior);
+    getPlayerCurrentSubAccount(client).interior = interior;
 }
 
 // ---------------------------------------------------------------------------