diff --git a/libraries/utils.robot b/libraries/utils.robot
index bd03aa3..d1cc9be 100755
--- a/libraries/utils.robot
+++ b/libraries/utils.robot
@@ -1109,12 +1109,15 @@
 
 Stop Logging
     [Arguments]    ${label}
-    [Documentation]    End logging for test; remove logfile if test passed
+    [Documentation]    End logging for test; remove logfile if test passed and ${logging} is set to False
     Run    sync
     Run Keyword If    ${kail_process}    Terminate Process    ${kail_process}
     ${test_logfile}=    Run Keyword If    "${container_log_dir}" != "${None}"
     ...    Join Path    ${container_log_dir}    ${label}-combined.log
-    Run Keyword If Test Passed    Run Keyword If    "${test_logfile}" != "${None}"    Remove File    ${test_logfile}
+    Run Keyword If Test Passed
+    ...    Run Keyword If    "${logging}" == "False"
+    ...    Run Keyword If    "${test_logfile}" != "${None}"
+    ...    Remove File    ${test_logfile}
     Run Keyword If    ${has_dataplane}    Echo Message to OLT Logs     END ${label}
 
 Clean Up Linux