diff --git a/lib/parse_server_sdk.dart b/lib/parse_server_sdk.dart
index 825fa4a7c..606fd131c 100644
--- a/lib/parse_server_sdk.dart
+++ b/lib/parse_server_sdk.dart
@@ -8,7 +8,6 @@ import 'dart:typed_data';
 import 'dart:ui' as ui;
 
 import 'package:devicelocale/devicelocale.dart';
-import 'package:flutter/foundation.dart' show kIsWeb;
 import 'package:http/http.dart';
 import 'package:http/io_client.dart';
 import 'package:meta/meta.dart';
diff --git a/lib/src/base/parse_constants.dart b/lib/src/base/parse_constants.dart
index c95f46f9e..56a3d9962 100644
--- a/lib/src/base/parse_constants.dart
+++ b/lib/src/base/parse_constants.dart
@@ -81,3 +81,5 @@ const String keyVarInstallationId = 'installationId';
 // Error
 const String keyError = 'error';
 const String keyCode = 'code';
+
+const bool parseIsWeb = identical(0, 0.0);
diff --git a/lib/src/data/parse_core_data.dart b/lib/src/data/parse_core_data.dart
index b97f13ed4..02b37c2af 100644
--- a/lib/src/data/parse_core_data.dart
+++ b/lib/src/data/parse_core_data.dart
@@ -63,7 +63,7 @@ class ParseCoreData {
     if (liveListRetryIntervals != null) {
       _instance.liveListRetryIntervals = liveListRetryIntervals;
     } else {
-      _instance.liveListRetryIntervals = kIsWeb
+      _instance.liveListRetryIntervals = parseIsWeb
           ? <int>[0, 500, 1000, 2000, 5000]
           : <int>[0, 500, 1000, 2000, 5000, 10000];
     }
diff --git a/lib/src/data/parse_subclass_handler.dart b/lib/src/data/parse_subclass_handler.dart
index 1ee161167..3ed423c53 100644
--- a/lib/src/data/parse_subclass_handler.dart
+++ b/lib/src/data/parse_subclass_handler.dart
@@ -22,7 +22,7 @@ class ParseSubClassHandler {
   Map<String, ParseObjectConstructor> _subClassMap;
   ParseUserConstructor _parseUserConstructor;
   ParseFileConstructor _parseFileConstructor = ({String name, String url}) {
-    if (kIsWeb) {
+    if (parseIsWeb) {
       return ParseWebFile(null, name: name, url: url);
     } else {
       return ParseFile(null, name: name, url: url);
diff --git a/lib/src/objects/parse_installation.dart b/lib/src/objects/parse_installation.dart
index d5d6be828..34e9eaa45 100644
--- a/lib/src/objects/parse_installation.dart
+++ b/lib/src/objects/parse_installation.dart
@@ -68,7 +68,7 @@ class ParseInstallation extends ParseObject {
   /// Updates the installation with current device data
   Future<void> _updateInstallation() async {
     //Device type
-    if (kIsWeb) {
+    if (parseIsWeb) {
       set<String>(keyDeviceType, 'web');
     } else if (Platform.isAndroid) {
       set<String>(keyDeviceType, 'android');
@@ -83,7 +83,9 @@ class ParseInstallation extends ParseObject {
     }
 
     //Locale
-    final String locale = kIsWeb ? ui.window.locale.toString() : await Devicelocale.currentLocale;
+    final String locale = parseIsWeb
+        ? ui.window.locale.toString()
+        : await Devicelocale.currentLocale;
     if (locale != null && locale.isNotEmpty) {
       set<String>(keyLocaleIdentifier, locale);
     }
@@ -91,7 +93,7 @@ class ParseInstallation extends ParseObject {
     //Timezone
 
     //App info
-    if (!kIsWeb) {
+    if (!parseIsWeb) {
       final PackageInfo packageInfo = await PackageInfo.fromPlatform();
       set<String>(keyAppName, packageInfo.appName);
       set<String>(keyAppVersion, packageInfo.version);
diff --git a/lib/src/storage/core_store_sem_impl.dart b/lib/src/storage/core_store_sem_impl.dart
index 854ab5d4f..f8e2c317d 100644
--- a/lib/src/storage/core_store_sem_impl.dart
+++ b/lib/src/storage/core_store_sem_impl.dart
@@ -12,7 +12,8 @@ class CoreStoreSembastImp implements CoreStore {
       factory ??= databaseFactoryIo;
       final SembastCodec codec = getXXTeaSembastCodec(password: password);
       String dbDirectory = '';
-      if (!kIsWeb && (Platform.isIOS || Platform.isAndroid || Platform.isMacOS))
+      if (!parseIsWeb &&
+          (Platform.isIOS || Platform.isAndroid || Platform.isMacOS))
         dbDirectory = (await getApplicationDocumentsDirectory()).path;
       final String dbPath = path.join('$dbDirectory/parse', 'parse.db');
       final Database db = await factory.openDatabase(dbPath, codec: codec);
diff --git a/lib/src/utils/parse_utils.dart b/lib/src/utils/parse_utils.dart
index 0180f0021..0fa7b4c2b 100644
--- a/lib/src/utils/parse_utils.dart
+++ b/lib/src/utils/parse_utils.dart
@@ -65,8 +65,8 @@ String removeTrailingSlash(String serverUrl) {
   }
 }
 
-Future<ParseResponse> batchRequest(List<dynamic> requests,
-    List<ParseObject> objects,
+Future<ParseResponse> batchRequest(
+    List<dynamic> requests, List<ParseObject> objects,
     {ParseHTTPClient client, bool debug}) async {
   debug = isDebugEnabled(objectLevelDebug: debug);
   client = client ??