diff --git a/src/sys/create.c b/src/sys/create.c
index 94eb38ab..4531c371 100644
--- a/src/sys/create.c
+++ b/src/sys/create.c
@@ -481,9 +481,11 @@ VOID FspFsvolCreateComplete(
         }
 
         if (OpenedFsContext != FsContext)
+        {
             FspFileContextRelease(FsContext);
-
-        FspIopRequestContext(Request, RequestFsContext) = FsContext = OpenedFsContext;
+            FsContext = OpenedFsContext;
+        }
+        FspIopRequestContext(Request, RequestFsContext) = FsContext;
 
         if (FILE_OPENED == Response->IoStatus.Information)
         {