diff --git a/src/android.ts b/src/android.ts
index 398e044..c89629d 100644
--- a/src/android.ts
+++ b/src/android.ts
@@ -19,7 +19,7 @@ export async function androidPortForward(
    systemPort: number,
    devicePort: number,
 ) {
-   await adb.forwardPort(systemPort!, devicePort);
+   await adb.forwardPort(systemPort, devicePort);
 }
 
 export async function androidRemovePortForward(adb: ADB, systemPort: number) {
diff --git a/src/utils.ts b/src/utils.ts
index 89d3899..ee8fbc5 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -161,13 +161,13 @@ export async function fetchFlutterServerPort(
             `Checking if flutter server is running on port ${systemPort || devicePort} for simulator with id ${udid}`,
          );
          await waitForFlutterServer.bind(this)(
-            (systemPort || devicePort)!,
+            (systemPort || devicePort),
             packageName,
          );
          this.log.info(
             `Flutter server is successfully running on port ${systemPort || devicePort}`,
          );
-         return (systemPort || devicePort)!;
+         return (systemPort || devicePort);
       } catch (e) {
          return null;
       }