diff --git a/FreeRTOS-Plus/Demo/AWS/Fleet_Provisioning_Windows_Simulator/CSR_Demo/FleetProvisioningDemoExample.c b/FreeRTOS-Plus/Demo/AWS/Fleet_Provisioning_Windows_Simulator/CSR_Demo/FleetProvisioningDemoExample.c
index c8e75dd0a6..c796ca6f4c 100644
--- a/FreeRTOS-Plus/Demo/AWS/Fleet_Provisioning_Windows_Simulator/CSR_Demo/FleetProvisioningDemoExample.c
+++ b/FreeRTOS-Plus/Demo/AWS/Fleet_Provisioning_Windows_Simulator/CSR_Demo/FleetProvisioningDemoExample.c
@@ -606,8 +606,6 @@ int prvFleetProvisioningTask( void * pvParameters )
             {
                 LogError( ( "Failed to generate Key and Certificate Signing Request." ) );
             }
-
-            xPkcs11CloseSession( xP11Session );
         }
 
         /**** Connect to AWS IoT Core with provisioning claim credentials *****/
@@ -825,6 +823,8 @@ int prvFleetProvisioningTask( void * pvParameters )
 
         /**** Retry in case of failure ****************************************/
 
+        xPkcs11CloseSession( xP11Session );
+
         /* Increment the demo run count. */
         ulDemoRunCount++;
 
diff --git a/FreeRTOS-Plus/Demo/AWS/Fleet_Provisioning_Windows_Simulator/CSR_Demo/pkcs11_operations.c b/FreeRTOS-Plus/Demo/AWS/Fleet_Provisioning_Windows_Simulator/CSR_Demo/pkcs11_operations.c
index 4cf1af25f4..fb727a252d 100644
--- a/FreeRTOS-Plus/Demo/AWS/Fleet_Provisioning_Windows_Simulator/CSR_Demo/pkcs11_operations.c
+++ b/FreeRTOS-Plus/Demo/AWS/Fleet_Provisioning_Windows_Simulator/CSR_Demo/pkcs11_operations.c
@@ -392,11 +392,6 @@ bool xPkcs11CloseSession( CK_SESSION_HANDLE xP11Session )
         xResult = xFunctionList->C_CloseSession( xP11Session );
     }
 
-    if( xResult == CKR_OK )
-    {
-        xResult = xFunctionList->C_Finalize( NULL );
-    }
-
     return( xResult == CKR_OK );
 }