diff --git a/run.bat b/run.bat
index 26b37f6..eb3919d 100755
--- a/run.bat
+++ b/run.bat
@@ -60,15 +60,25 @@ if "%BUILD_MODE%"=="true" (
     )
     echo Build successful! Output: %CD%\%BUILD_OUTPUT%
 ) else (
+    rem Check if the executable exists
+    if not exist "%BUILD_OUTPUT%" (
+        echo Executable not found. Building it first...
+        go build -o "%BUILD_OUTPUT%" !GO_FILES!
+        if errorlevel 1 (
+            echo Build failed! Unable to run the application.
+            exit /b 1
+        )
+    )
+
     rem Construct the command
-    set CMD=go run !GO_FILES! !SKIP_CONFIG!
+    set CMD="%BUILD_OUTPUT% !SKIP_CONFIG!"
     if not "%PORT%"=="" set CMD=!CMD! --port %PORT%
     if not "%DOMAIN%"=="" set CMD=!CMD! --domain %DOMAIN%
 
     rem Informative output
     echo Starting application with command: !CMD!
 
-    rem Run the Go program with the constructed command
+    rem Run the application
     call !CMD!
 )
 
diff --git a/run.sh b/run.sh
index c5fd207..2aeefad 100755
--- a/run.sh
+++ b/run.sh
@@ -51,12 +51,21 @@ if $BUILD_MODE; then
   fi
 else
   # Run mode
-  CMD="go run $GO_FILES $SKIP_CONFIG"
+  CMD="./$BUILD_OUTPUT $SKIP_CONFIG"
   [ -n "$PORT" ] && CMD="$CMD --port $PORT"
   [ -n "$DOMAIN" ] && CMD="$CMD --domain $DOMAIN"
 
+  if [ ! -f "$SCRIPT_DIR/$BUILD_OUTPUT" ]; then
+    echo "Executable not found. Building it first..."
+    go build -o "$SCRIPT_DIR/$BUILD_OUTPUT" $GO_FILES
+    if [ $? -ne 0 ]; then
+      echo "Build failed! Unable to run the application."
+      exit 1
+    fi
+  fi
+
   echo "Starting application with command: $CMD"
 
-  # Run the Go program with the constructed command
+  # Run the executable
   eval $CMD
 fi