diff --git a/packages/hoppscotch-common/src/components/http/RequestTab.vue b/packages/hoppscotch-common/src/components/http/RequestTab.vue
index 6e9a65a0..66352e57 100644
--- a/packages/hoppscotch-common/src/components/http/RequestTab.vue
+++ b/packages/hoppscotch-common/src/components/http/RequestTab.vue
@@ -4,7 +4,7 @@
       <HttpRequest v-model="tab" />
       <HttpRequestOptions
         v-model="tab.document.request"
-        v-model:option-tab="tab.document.optionTabPreference"
+        v-model:option-tab="tab.document.optionTabPreference!"
         v-model:inherited-properties="tab.document.inheritedProperties"
       />
     </template>
diff --git a/packages/hoppscotch-common/src/components/smart/EnvInput.vue b/packages/hoppscotch-common/src/components/smart/EnvInput.vue
index 2073c8b8..748baae8 100644
--- a/packages/hoppscotch-common/src/components/smart/EnvInput.vue
+++ b/packages/hoppscotch-common/src/components/smart/EnvInput.vue
@@ -376,7 +376,7 @@ const aggregateEnvs = useReadonlyStream(
 const tabs = useService(RESTTabService)
 
 const envVars = computed(() => {
-  if (props.envs) {
+  if (props.envs?.length) {
     return props.envs.map((x) => {
       const { key, secret } = x
       const currentValue = secret ? "********" : x.currentValue