diff --git a/frontend/src/components/NewModalSubscripton.js b/frontend/src/components/NewModalSubscripton.js
index e87f0d18..9fb40a2b 100644
--- a/frontend/src/components/NewModalSubscripton.js
+++ b/frontend/src/components/NewModalSubscripton.js
@@ -73,8 +73,6 @@ const NewSubscription = ({
             autoComplete="off"
             placeholder="Enter label"
             name="label"
-            defaultValue={initialAddress ?? ""}
-            isReadOnly={!!initialAddress}
             ref={register({ required: "label is required!" })}
           ></Input>
           <FormErrorMessage color="unsafe.400" pl="1">
@@ -87,6 +85,8 @@ const NewSubscription = ({
             autoComplete="off"
             my={2}
             placeholder="Enter address"
+            defaultValue={initialAddress ?? undefined}
+            isReadOnly={!!initialAddress}
             name="address"
             ref={register({ required: "address is required!" })}
           ></Input>
diff --git a/frontend/src/components/stream-cards/EthereumWhalewatch.js b/frontend/src/components/stream-cards/EthereumWhalewatch.js
index 4b53f0bc..5b641e86 100644
--- a/frontend/src/components/stream-cards/EthereumWhalewatch.js
+++ b/frontend/src/components/stream-cards/EthereumWhalewatch.js
@@ -1,4 +1,4 @@
-import React, { useContext, useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import {
   Text,
   Stack,
@@ -6,7 +6,6 @@ import {
   useClipboard,
   Heading,
   Image,
-  useMediaQuery,
   Spacer,
   Spinner,
   chakra,
@@ -18,7 +17,6 @@ import {
   IconButton,
   useDisclosure,
 } from "@chakra-ui/react";
-import UIContext from "../../core/providers/UIProvider/context";
 import { useToast } from "../../core/hooks";
 import { useSubscriptions } from "../../core/hooks";
 import moment from "moment";
@@ -33,7 +31,6 @@ const EthereumWhalewatchCard_ = ({
   const [newSubscriptionWhaleType, setNewSubscriptionWhaleType] = useState();
   const { isOpen, onOpen, onClose } = useDisclosure();
   const { subscriptionsCache, subscriptionTypeIcons } = useSubscriptions();
-  const ui = useContext(UIContext);
   const [copyString, setCopyString] = useState(false);
   const [icon, setIcon] = useState(null);
   const { onCopy, hasCopied } = useClipboard(copyString, 1);
@@ -53,8 +50,6 @@ const EthereumWhalewatchCard_ = ({
       setIcon(subscriptionTypeIcons.ethereum_whalewatch);
     }
   }, [subscriptionTypeIcons, setIcon]);
-
-  const [showFullView] = useMediaQuery(["(min-width: 420px)"]);
   if (subscriptionsCache.isLoading) return <Spinner />;
 
   const whales = {