diff --git a/nx/source/services/vi.c b/nx/source/services/vi.c
index dc824f9b..924f4f7f 100644
--- a/nx/source/services/vi.c
+++ b/nx/source/services/vi.c
@@ -642,6 +642,7 @@ Result viDestroyManagedLayer(ViLayer *layer) {
         } *resp = r.Raw;
 
         rc = resp->result;
+        memset(layer, 0, sizeof(ViLayer));
     }
 
     return rc;
@@ -992,7 +993,7 @@ Result viCloseLayer(ViLayer *layer)
         } *resp = r.Raw;
 
         rc = resp->result;
-        layer->initialized = false;
+        memset(layer, 0, sizeof(ViLayer));
     }
 
     return rc;